diff options
author | Guo Chao <yan@linux.vnet.ibm.com> | 2012-11-02 06:33:21 -0400 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-11-13 19:14:28 -0500 |
commit | 18595411a7146330ec19adf0b9db8e6736c84a4e (patch) | |
tree | e92309d75edc34d48830b5d7712876a03dbde5c0 /virt/kvm | |
parent | f026399fc90655ac444c62139aa4f8a02e1c795a (diff) |
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/kvm')
-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: | |||
1954 | kvm_sregs = memdup_user(argp, sizeof(*kvm_sregs)); | 1954 | kvm_sregs = memdup_user(argp, sizeof(*kvm_sregs)); |
1955 | if (IS_ERR(kvm_sregs)) { | 1955 | if (IS_ERR(kvm_sregs)) { |
1956 | r = PTR_ERR(kvm_sregs); | 1956 | r = PTR_ERR(kvm_sregs); |
1957 | kvm_sregs = NULL; | ||
1957 | goto out; | 1958 | goto out; |
1958 | } | 1959 | } |
1959 | r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs); | 1960 | r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs); |
@@ -2054,6 +2055,7 @@ out_free2: | |||
2054 | fpu = memdup_user(argp, sizeof(*fpu)); | 2055 | fpu = memdup_user(argp, sizeof(*fpu)); |
2055 | if (IS_ERR(fpu)) { | 2056 | if (IS_ERR(fpu)) { |
2056 | r = PTR_ERR(fpu); | 2057 | r = PTR_ERR(fpu); |
2058 | fpu = NULL; | ||
2057 | goto out; | 2059 | goto out; |
2058 | } | 2060 | } |
2059 | r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu); | 2061 | r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu); |