Skip to contentSkip to conversation

Patch "kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 27, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

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.9-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.9 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 foo@baz Sun May 27 17:33:37 CEST 2018

From: Paolo Bonzini <[email protected]>
Date: Thu, 26 Oct 2017 15:45:47 +0200
Subject: kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl

From: Paolo Bonzini <[email protected]>

[ 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.

---
 arch/x86/kvm/x86.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +4 -3
@@ -4131,13 +4131,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 [email protected] are

queue-4.9/kvm-x86-fix-kvm_xen_hvm_config-ioctl.patch queue-4.9/kvm-map-pfn-type-memory-regions-as-writable-if-possible.patch queue-4.9/kvm-fix-warning-for-config_have_kvm_eventfd-builds.patch queue-4.9/kvm-vmx-expose-ssbd-properly-to-guests.patch