[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL for-2.12 6/8] vfio-ccw: fix memory leaks in vfio_ccw_
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL for-2.12 6/8] vfio-ccw: fix memory leaks in vfio_ccw_realize() |
Date: |
Mon, 9 Apr 2018 17:15:31 +0200 |
From: Greg Kurz <address@hidden>
If the subchannel is already attached or if vfio_get_device() fails, the
code jumps to the 'out_device_err' label and doesn't free the string it
has just allocated.
The code should be reworked so that vcdev->vdev.name only gets set when
the device has been attached, and freed when it is about to be detached.
This could be achieved with the addition of a vfio_ccw_get_device()
function that would be the counterpart of vfio_put_device(). But this is
a more elaborate cleanup that should be done in a follow-up. For now,
let's just add calls to g_free() on the buggy error paths.
Signed-off-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/vfio/ccw.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 4e5855741a..fe34b50769 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -357,11 +357,13 @@ static void vfio_ccw_realize(DeviceState *dev, Error
**errp)
if (strcmp(vbasedev->name, vcdev->vdev.name) == 0) {
error_setg(&err, "vfio: subchannel %s has already been attached",
vcdev->vdev.name);
+ g_free(vcdev->vdev.name);
goto out_device_err;
}
}
if (vfio_get_device(group, cdev->mdevid, &vcdev->vdev, &err)) {
+ g_free(vcdev->vdev.name);
goto out_device_err;
}
--
2.14.3
- [qemu-s390x] [PULL for-2.12 0/8] s390x fixes for -rc3, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 2/8] s390: Refactor IPL parameter block generation, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 3/8] s390: Ensure IPL from SCSI works as expected, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 4/8] s390: Do not pass inofficial IPL type to the guest, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 1/8] s390x/kvm: call cpu_synchronize_state() on every kvm_arch_handle_exit(), Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 7/8] s390x/mmu: don't overwrite pending exception in mmu translate, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 6/8] vfio-ccw: fix memory leaks in vfio_ccw_realize(),
Cornelia Huck <=
- [qemu-s390x] [PULL for-2.12 8/8] s390x: load_psw() should only exchange the PSW for KVM, Cornelia Huck, 2018/04/09
- [qemu-s390x] [PULL for-2.12 5/8] pc-bios/s390: update images, Cornelia Huck, 2018/04/09
- Re: [qemu-s390x] [PULL for-2.12 0/8] s390x fixes for -rc3, Peter Maydell, 2018/04/10