|
Message-ID: <15245820659976@kroah.com> Date: Tue, 24 Apr 2018 17:01:05 +0200 From: <gregkh@...uxfoundation.org> To: alexander.levin@...rosoft.com,gregkh@...uxfoundation.org,keescook@...omium.org,kernel-hardening@...ts.openwall.com,pbonzini@...hat.com,rkrcmar@...hat.com Cc: <stable-commits@...r.kernel.org> Subject: Patch "kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl" has been added to the 4.14-stable tree This is a note to let you know that I've just added the patch titled kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl 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-x86-fix-kvm_xen_hvm_config-ioctl.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 <stable@...r.kernel.org> know about it. >From foo@baz Tue Apr 24 15:29:20 CEST 2018 From: Paolo Bonzini <pbonzini@...hat.com> Date: Thu, 26 Oct 2017 15:45:47 +0200 Subject: kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl From: Paolo Bonzini <pbonzini@...hat.com> [ Upstream commit 51776043afa415435c7e4636204fbe4f7edc4501 ] This ioctl is obsolete (it was used by Xenner as far as I know) but still let's not break it gratuitously... Its handler is copying directly into struct kvm. Go through a bounce buffer instead, with the added benefit that we can actually do something useful with the flags argument---the previous code was exiting with -EINVAL but still doing the copy. This technically is a userspace ABI breakage, but since no one should be using the ioctl, it's a good occasion to see if someone actually complains. Cc: kernel-hardening@...ts.openwall.com Cc: Kees Cook <keescook@...omium.org> Cc: Radim Krčmář <rkrcmar@...hat.com> Signed-off-by: Paolo Bonzini <pbonzini@...hat.com> Signed-off-by: Kees Cook <keescook@...omium.org> Signed-off-by: Sasha Levin <alexander.levin@...rosoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- arch/x86/kvm/x86.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4225,13 +4225,14 @@ long kvm_arch_vm_ioctl(struct file *filp mutex_unlock(&kvm->lock); break; case KVM_XEN_HVM_CONFIG: { + struct kvm_xen_hvm_config xhc; r = -EFAULT; - if (copy_from_user(&kvm->arch.xen_hvm_config, argp, - sizeof(struct kvm_xen_hvm_config))) + if (copy_from_user(&xhc, argp, sizeof(xhc))) goto out; r = -EINVAL; - if (kvm->arch.xen_hvm_config.flags) + if (xhc.flags) goto out; + memcpy(&kvm->arch.xen_hvm_config, &xhc, sizeof(xhc)); r = 0; break; } Patches currently in stable-queue which might be from pbonzini@...hat.com are queue-4.14/kvm-x86-fix-kvm_xen_hvm_config-ioctl.patch queue-4.14/kvm-map-pfn-type-memory-regions-as-writable-if-possible.patch queue-4.14/x86-kvm-vmx-do-not-use-vm-exit-instruction-length-for-fast-mmio-when-running-nested.patch queue-4.14/revert-kvm-x86-fix-smram-accessing-even-if-vm-is-shutdown.patch queue-4.14/x86-hyperv-check-for-required-priviliges-in-hyperv_init.patch
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.