Patch "KVM: PPC: Book3S HV: Don't call real-mode XICS hypercall handlers if not enabled" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
KVM: PPC: Book3S HV: Don't call real-mode XICS hypercall handlers if not enabled
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
kvm-ppc-book3s-hv-don-t-call-real-mode-xics-hypercall-handlers-if-not-enabled.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
00bb6ae5006205e041ce9784c819460562351d47Mon Sep 17 00:00:00 2001
From: Paul Mackerras <[email protected]>
Date: Thu, 26 Oct 2017 17:00:22 +1100
Subject: KVM: PPC: Book3S HV: Don't call real-mode XICS hypercall handlers if not enabled
From: Paul Mackerras <[email protected]>
commit 00bb6ae5006205e041ce9784c819460562351d47 upstream.
When running a guest on a POWER9 system with the in-kernel XICS emulation disabled (for example by running QEMU with the parameter "-machine pseries,kernel_irqchip=off"), the kernel does not pass the XICS-related hypercalls such as H_CPPR up to userspace for emulation there as it should.
The reason for this is that the real-mode handlers for these hypercalls don't check whether a XICS device has been instantiated before calling the xics-on-xive code. That code doesn't check either, leading to potential NULL pointer dereferences because vcpu->arch.xive_vcpu is NULL. Those dereferences won't cause an exception in real mode but will lead to kernel memory corruption.
This fixes it by adding kvmppc_xics_enabled() checks before calling the XICS functions.
--- arch/powerpc/kvm/book3s_hv_builtin.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/powerpc/kvm/book3s_hv_builtin.c +12 -0
@@ -529,6 +529,8 @@ static inline bool is_rm(void)unsigned long kvmppc_rm_h_xirr (struct kvm_vcpu *vcpu) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ;if (xive_enabled ()) {if (is_rm ())return xive_rm_h_xirr (vcpu);
@@ -541,6 +543,8 @@ unsigned long kvmppc_rm_h_xirr(struct kvunsigned long kvmppc_rm_h_xirr_x (struct kvm_vcpu *vcpu) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ; vcpu->arch.gpr[5 ] =get_tb ();if (xive_enabled ()) {if (is_rm ())
@@ -554,6 +558,8 @@ unsigned long kvmppc_rm_h_xirr_x(structunsigned long kvmppc_rm_h_ipoll (struct kvm_vcpu *vcpu,unsigned long server) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ;if (xive_enabled ()) {if (is_rm ())return xive_rm_h_ipoll (vcpu, server);
@@ -567,6 +573,8 @@ unsigned long kvmppc_rm_h_ipoll(struct kint kvmppc_rm_h_ipi (struct kvm_vcpu *vcpu,unsigned long server,unsigned long mfrr) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ;if (xive_enabled ()) {if (is_rm ())return xive_rm_h_ipi (vcpu, server, mfrr);
@@ -579,6 +587,8 @@ int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpint kvmppc_rm_h_cppr (struct kvm_vcpu *vcpu,unsigned long cppr) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ;if (xive_enabled ()) {if (is_rm ())return xive_rm_h_cppr (vcpu, cppr);
@@ -591,6 +601,8 @@ int kvmppc_rm_h_cppr(struct kvm_vcpu *vcint kvmppc_rm_h_eoi (struct kvm_vcpu *vcpu,unsigned long xirr) { +if (!kvmppc_xics_enabled (vcpu)) +return H_TOO_HARD ;if (xive_enabled ()) {if (is_rm ())return xive_rm_h_eoi (vcpu, xirr);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/kvm-ppc-book3s-hv-don-t-call-real-mode-xics-hypercall-handlers-if-not-enabled.patch