2 files changed, 8 insertions, 13 deletions

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 49fa1f0e59bd..40905ce6be0a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2689,14 +2689,11 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                 break;
         }
         case KVM_SET_LAPIC: {
-                r = -EINVAL;
                 if (!vcpu->arch.apic)
                         goto out;
                 u.lapic = memdup_user(argp, sizeof(*u.lapic));
-                if (IS_ERR(u.lapic)) {
-                        r = PTR_ERR(u.lapic);
-                        goto out;
-                }
+                if (IS_ERR(u.lapic))
+                        return PTR_ERR(u.lapic);
 
                 r = kvm_vcpu_ioctl_set_lapic(vcpu, u.lapic);
                 if (r)
@@ -2877,10 +2874,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
         }
         case KVM_SET_XSAVE: {
                 u.xsave = memdup_user(argp, sizeof(*u.xsave));
-                if (IS_ERR(u.xsave)) {
-                        r = PTR_ERR(u.xsave);
-                        goto out;
-                }
+                if (IS_ERR(u.xsave))
+                        return PTR_ERR(u.xsave);
 
                 r = kvm_vcpu_ioctl_x86_set_xsave(vcpu, u.xsave);
                 break;
@@ -2902,10 +2897,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
         }
         case KVM_SET_XCRS: {
                 u.xcrs = memdup_user(argp, sizeof(*u.xcrs));
-                if (IS_ERR(u.xcrs)) {
-                        r = PTR_ERR(u.xcrs);
-                        goto out;
-                }
+                if (IS_ERR(u.xcrs))
+                        return PTR_ERR(u.xcrs);
 
                 r = kvm_vcpu_ioctl_x86_set_xcrs(vcpu, u.xcrs);
                 break;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 2fb73191801f..316d76aa030d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1954,6 +1954,7 @@ out_free2:
                 kvm_sregs = memdup_user(argp, sizeof(*kvm_sregs));
                 if (IS_ERR(kvm_sregs)) {
                         r = PTR_ERR(kvm_sregs);
+                        kvm_sregs = NULL;
                         goto out;
                 }
                 r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs);
@@ -2054,6 +2055,7 @@ out_free2:
                 fpu = memdup_user(argp, sizeof(*fpu));
                 if (IS_ERR(fpu)) {
                         r = PTR_ERR(fpu);
+                        fpu = NULL;
                         goto out;
                 }
                 r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);