diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-09-01 16:53:46 +0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-01-09 13:14:54 +0400 |
| commit | 458ff3c099a1266991208f2c009afc2405e5b6bc (patch) | |
| tree | f8fa168d2d33e3a0ed42b3a3a4644257364fc55d /arch/powerpc/kvm | |
| parent | 398a76c677a2612c1b03a8d20fbf116e3778ebec (diff) | |
| download | linux-458ff3c099a1266991208f2c009afc2405e5b6bc.tar.xz | |
KVM: PPC: fix couple of memory leaks in MPIC/XICS devices
XICS failed to free xics structure on error path. MPIC destroy handler
forgot to delete kvm_device structure.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/book3s_xics.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kvm/mpic.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index 02a17dcf1610..d1acd32a64c0 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c @@ -1246,8 +1246,10 @@ static int kvmppc_xics_create(struct kvm_device *dev, u32 type) kvm->arch.xics = xics; mutex_unlock(&kvm->lock); - if (ret) + if (ret) { + kfree(xics); return ret; + } xics_debugfs_init(xics); diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index 2861ae9eaae6..efbd9962a209 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -1635,6 +1635,7 @@ static void mpic_destroy(struct kvm_device *dev) dev->kvm->arch.mpic = NULL; kfree(opp); + kfree(dev); } static int mpic_set_default_irq_routing(struct openpic *opp) |