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

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Wed, 18 Jan 2017 20:43:41 +0100

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

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 arch/mips/kvm/mips.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 06a60b19acfb..1dad78f74e8c 100644
--- 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,9 +1163,8 @@ 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;
        }
-- 
2.11.0