Commit adb4b4d6 authored by Kele Huang's avatar Kele Huang Committed by Dongxu Sun
Browse files

ptp: fix error print of ptp_kvm on X86_64 platform 

mainline inclusion
from mainline-v5.15-rc1
commit c2402d43
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8DWT1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c2402d43d183b11445aed921e7bebcd47ef222f1



--------------------------------

Commit a86ed2cf ("ptp: Don't print an error if ptp_kvm is not supported")
fixes the error message print on ARM platform by only concerning about
the case that the error returned from kvm_arch_ptp_init() is not -EOPNOTSUPP.
Although the ARM platform returns -EOPNOTSUPP if ptp_kvm is not supported
while X86_64 platform returns -KVM_EOPNOTSUPP, both error codes share the
same value 95.

Actually kvm_arch_ptp_init() on X86_64 platform can return three kinds of
errors (-KVM_ENOSYS, -KVM_EOPNOTSUPP and -KVM_EFAULT). The problem is that
-KVM_EOPNOTSUPP is masked out and -KVM_EFAULT is ignored among them.
This patch fixes this by returning them to ptp_kvm_init() respectively.

Signed-off-by: default avatarKele Huang <huangkele@bytedance.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDongxu Sun <sundongxu3@huawei.com>
parent 08c59156

drivers/ptp/ptp_kvm_x86.c

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ int kvm_arch_ptp_init(void) 


	ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,

			     KVM_CLOCK_PAIRING_WALLCLOCK);

	if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP)

	if (ret == -KVM_ENOSYS)

		return -ENODEV;



	return 0;

	return ret;

}



int kvm_arch_ptp_get_clock(struct timespec64 *ts)