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

KVM: PPC: Centralize locking of arch specific vcpu ioctls

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2010-05-13 12:30:43 +03:00
parent bc923cc93b
commit 19483d1440
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/kvm/powerpc.c
View File

@@ -512,15 +512,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
long r; long r;
switch (ioctl) { if (ioctl == KVM_INTERRUPT) {
case KVM_INTERRUPT: {
struct kvm_interrupt irq; struct kvm_interrupt irq;
r = -EFAULT; r = -EFAULT;
if (copy_from_user(&irq, argp, sizeof(irq))) if (copy_from_user(&irq, argp, sizeof(irq)))
goto out; goto out_nolock;
r = kvm_vcpu_ioctl_interrupt(vcpu, &irq); r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);
break; goto out_nolock;
} }
vcpu_load(vcpu);
switch (ioctl) {
case KVM_ENABLE_CAP: case KVM_ENABLE_CAP:
{ {
struct kvm_enable_cap cap; struct kvm_enable_cap cap;
@@ -535,6 +537,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
} }
out: out:
vcpu_put(vcpu);
out_nolock:
return r; return r;
} }