lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Reduce stack usage in kvm_arch_vcpu_ioctl()

Browse Source 
[sheng: fix KVM_GET_LAPIC using wrong size]

Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Dave Hansen
2008-08-11 10:01:47 -07:00
committed by Avi Kivity
parent fa3795a730
commit b772ff362e
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/x86/kvm/x86.c
View File

@@ -1542,28 +1542,33 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
struct kvm_vcpu *vcpu = filp->private_data; struct kvm_vcpu *vcpu = filp->private_data;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
int r; int r;
struct kvm_lapic_state *lapic = NULL;
switch (ioctl) { switch (ioctl) {
case KVM_GET_LAPIC: { case KVM_GET_LAPIC: {
struct kvm_lapic_state lapic; lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
memset(&lapic, 0, sizeof lapic); r = -ENOMEM;
r = kvm_vcpu_ioctl_get_lapic(vcpu, &lapic); if (!lapic)
goto out;
r = kvm_vcpu_ioctl_get_lapic(vcpu, lapic);
if (r) if (r)
goto out; goto out;
r = -EFAULT; r = -EFAULT;
if (copy_to_user(argp, &lapic, sizeof lapic)) if (copy_to_user(argp, lapic, sizeof(struct kvm_lapic_state)))
goto out; goto out;
r = 0; r = 0;
break; break;
} }
case KVM_SET_LAPIC: { case KVM_SET_LAPIC: {
struct kvm_lapic_state lapic; lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
r = -ENOMEM;
r = -EFAULT; if (!lapic)
if (copy_from_user(&lapic, argp, sizeof lapic))
goto out; goto out;
r = kvm_vcpu_ioctl_set_lapic(vcpu, &lapic);; r = -EFAULT;
if (copy_from_user(lapic, argp, sizeof(struct kvm_lapic_state)))
goto out;
r = kvm_vcpu_ioctl_set_lapic(vcpu, lapic);
if (r) if (r)
goto out; goto out;
r = 0; r = 0;
@@ -1661,6 +1666,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
r = -EINVAL; r = -EINVAL;
} }
out: out:
if (lapic)
kfree(lapic);
return r; return r;
} }