vfio-ccw: plug memory leak while getting region info
PATCH 1/1 vfio-ccw: plug memory leak while getting region info
vfio_get_dev_region_info() unconditionally allocates memory for a passed-in vfio_region_info structure (and does not re-use an already allocated structure). Therefore, we have to free the structure we pass to that function in vfio_ccw_get_region() for every region we successfully obtained information for.
--- hw/vfio/ccw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/vfio/ccw.c +4 -1
@@ -491,6 +491,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) vcdev->io_region_offset = info->offset; vcdev->io_region =g_malloc0 (info->size); +g_free (info);/* check for the optional async command region */ ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
@@ -503,6 +504,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->async_cmd_region_offset = info->offset; vcdev->async_cmd_region =g_malloc0 (info->size); +g_free (info); } ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
@@ -515,6 +517,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->schib_region_offset = info->offset; vcdev->schib_region =g_malloc (info->size); +g_free (info); } ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
@@ -528,9 +531,9 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->crw_region_offset = info->offset; vcdev->crw_region =g_malloc (info->size); +g_free (info); } -g_free (info);return ; out_err:
Signature · 1 line
2.25.4
Quoted 5 lines · Cornelia Huck
vfio_get_dev_region_info()unconditionally allocates memory for a passed-invfio_region_infostructure (and does not re-use an already allocated structure). Therefore, we have to free the structure we pass to that function invfio_ccw_get_region()for every region we successfully obtained information for.
Ah, yes. This makes sense. A little messy, but hopefully we're done with new regions for the time being.
Quoted 6 lines
Reported-by Alex Williamson <[email protected]>Fixes 8fadea24de4e ("vfio-ccw: support async command subregion")Fixes 46ea3841edaf ("vfio-ccw: Add support for the schib region")Fixes f030532f2ad6 ("vfio-ccw: Add support for the CRW region and IRQ")Signed-off-by Cornelia Huck <[email protected]>
Quoted 44 lines
--- hw/vfio/ccw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)hw/vfio/ccw.c +4
-1@@ -491,6 +491,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) vcdev->io_region_offset = info->offset; vcdev->io_region =g_malloc0 (info->size); +g_free (info);/* check for the optional async command region */ ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,@@ -503,6 +504,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->async_cmd_region_offset = info->offset; vcdev->async_cmd_region =g_malloc0 (info->size); +g_free (info); } ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,@@ -515,6 +517,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->schib_region_offset = info->offset; vcdev->schib_region =g_malloc (info->size); +g_free (info); } ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,@@ -528,9 +531,9 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) } vcdev->crw_region_offset = info->offset; vcdev->crw_region =g_malloc (info->size); +g_free (info); } -g_free (info);return ; out_err:
Quoted 6 lines · Cornelia Huck
vfio_get_dev_region_info()unconditionally allocates memory for a passed-invfio_region_infostructure (and does not re-use an already allocated structure). Therefore, we have to free the structure we pass to that function invfio_ccw_get_region()for every region we successfully obtained information for.
Quoted 8 lines
Reported-by Alex Williamson <[email protected]>Fixes 8fadea24de4e ("vfio-ccw: support async command subregion")Fixes 46ea3841edaf ("vfio-ccw: Add support for the schib region")Fixes f030532f2ad6 ("vfio-ccw: Add support for the CRW region and IRQ")Signed-off-by Cornelia Huck <[email protected]>--- hw/vfio/ccw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Cornelia Huck
AppliedQuoted 6 lines · On Mon, 28 Sep 2020 12:17:01 +0200 Cornelia Huck <[email protected]> wrote:
vfio_get_dev_region_info()unconditionally allocates memory for a passed-invfio_region_infostructure (and does not re-use an already allocated structure). Therefore, we have to free the structure we pass to that function invfio_ccw_get_region()for every region we successfully obtained information for.
Quoted 8 lines
Reported-by Alex Williamson <[email protected]>Fixes 8fadea24de4e ("vfio-ccw: support async command subregion")Fixes 46ea3841edaf ("vfio-ccw: Add support for the schib region")Fixes f030532f2ad6 ("vfio-ccw: Add support for the CRW region and IRQ")Signed-off-by Cornelia Huck <[email protected]>--- hw/vfio/ccw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Queued to s390-next.