diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-01-16 14:58:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-07 01:53:03 +0300 |
| commit | 0b4a17fc634bf511bfca67ab4c6ecea5ad6db058 (patch) | |
| tree | c297e3216774239389b25deda0c3b8567fda5abe /arch/s390 | |
| parent | 6d6cdcaf12560db583b098baca23e3bdab78bcaa (diff) | |
| download | linux-0b4a17fc634bf511bfca67ab4c6ecea5ad6db058.tar.xz | |
KVM: s390: avoid memory leaks if __inject_vm() fails
commit 428d53be5e7468769d4e7899cca06ed5f783a6e1 upstream.
We have to delete the allocated interrupt info if __inject_vm() fails.
Otherwise user space can keep flooding kvm with floating interrupts and
provoke more and more memory leaks.
Reported-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 57ed057cba65..29e2e5aa2111 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -876,6 +876,7 @@ int kvm_s390_inject_vm(struct kvm *kvm, struct kvm_s390_interrupt *s390int) { struct kvm_s390_interrupt_info *inti; + int rc; inti = kzalloc(sizeof(*inti), GFP_KERNEL); if (!inti) @@ -923,7 +924,10 @@ int kvm_s390_inject_vm(struct kvm *kvm, trace_kvm_s390_inject_vm(s390int->type, s390int->parm, s390int->parm64, 2); - return __inject_vm(kvm, inti); + rc = __inject_vm(kvm, inti); + if (rc) + kfree(inti); + return rc; } void kvm_s390_reinject_io_int(struct kvm *kvm, |