summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2017-01-22 11:30:21 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-02-17 12:29:42 +0100
commitf6a3b168e56abe094b5c93dbafc2f0a0bf64e702 (patch)
treeac31f00c6b271d05ca3d6f528a1a8390d1af04f7 /virt
parentbd7e5b0899a429445cc6e3037c13f8b5ae3be903 (diff)
downloadlinux-f6a3b168e56abe094b5c93dbafc2f0a0bf64e702.tar.gz
linux-f6a3b168e56abe094b5c93dbafc2f0a0bf64e702.tar.bz2
linux-f6a3b168e56abe094b5c93dbafc2f0a0bf64e702.zip
KVM: Return directly after a failed copy_from_user() in kvm_vm_compat_ioctl()
* 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>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 263a80513ad9..bd131c539c1e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -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