KVM: Return directly after a failed copy_from_user() in kvm_vm_compat_ioctl()
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 22 Jan 2017 10:30:21 +0000 (11:30 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 17 Feb 2017 11:29:42 +0000 (12:29 +0100)
* Return directly after a call of the function "copy_from_user" failed
  in a case block.

  This issue was detected by using the Coccinelle software.

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

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c

index 263a80513ad99ab8557b530e7ef4288262c40514..bd131c539c1e496990d705e2d93f8fb5eaca9e72 100644 (file)
@@ -3148,10 +3148,9 @@ static long kvm_vm_compat_ioctl(struct file *filp,
                struct compat_kvm_dirty_log compat_log;
                struct kvm_dirty_log log;
 
-               r = -EFAULT;
                if (copy_from_user(&compat_log, (void __user *)arg,
                                   sizeof(compat_log)))
-                       goto out;
+                       return -EFAULT;
                log.slot         = compat_log.slot;
                log.padding1     = compat_log.padding1;
                log.padding2     = compat_log.padding2;
@@ -3163,8 +3162,6 @@ static long kvm_vm_compat_ioctl(struct file *filp,
        default:
                r = kvm_vm_ioctl(filp, ioctl, arg);
        }
-
-out:
        return r;
 }
 #endif