iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: KVM: Return directly after a failed copy_from_user() in kvm_arch_vcpu_ioctl()

Browse Source 
* Return directly after a call of the function "copy_from_user" failed
  in a case block.

* Delete the jump label "out" which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
This commit is contained in:
Markus Elfring 2017-01-19 11:10:26 +01:00 committed by James Hogan
parent 0b4c208d44
commit 5a6da5f784
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/mips/kvm/mips.c
View File

@ -1152,10 +1152,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl,
{ {
struct kvm_mips_interrupt irq; struct kvm_mips_interrupt irq;
r = -EFAULT;
if (copy_from_user(&irq, argp, sizeof(irq))) if (copy_from_user(&irq, argp, sizeof(irq)))
goto out; return -EFAULT;
kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__,
irq.irq); irq.irq);
@ -1165,17 +1163,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl,
case KVM_ENABLE_CAP: { case KVM_ENABLE_CAP: {
struct kvm_enable_cap cap; struct kvm_enable_cap cap;
r = -EFAULT;
if (copy_from_user(&cap, argp, sizeof(cap))) if (copy_from_user(&cap, argp, sizeof(cap)))
goto out; return -EFAULT;
r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap); r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
break; break;
} }
default: default:
r = -ENOIOCTLCMD; r = -ENOIOCTLCMD;
} }
out:
return r; return r;
} }