diff options
author | Guo Chao <yan@linux.vnet.ibm.com> | 2012-11-02 18:33:21 +0800 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-11-13 22:14:28 -0200 |
commit | 18595411a7146330ec19adf0b9db8e6736c84a4e (patch) | |
tree | e92309d75edc34d48830b5d7712876a03dbde5c0 /virt | |
parent | f026399fc90655ac444c62139aa4f8a02e1c795a (diff) | |
download | linux-stable-18595411a7146330ec19adf0b9db8e6736c84a4e.tar.gz linux-stable-18595411a7146330ec19adf0b9db8e6736c84a4e.tar.bz2 linux-stable-18595411a7146330ec19adf0b9db8e6736c84a4e.zip |
KVM: do not kfree error pointer
We should avoid kfree()ing error pointer in kvm_vcpu_ioctl() and
kvm_arch_vcpu_ioctl().
Signed-off-by: Guo Chao <yan@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |