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

* 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>

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