mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio-ccw: plug memory leak while getting region info

Browse Source 
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.

Fixes: 8fadea24de ("vfio-ccw: support async command subregion")
Fixes: 46ea3841ed ("vfio-ccw: Add support for the schib region")
Fixes: f030532f2a ("vfio-ccw: Add support for the CRW region and IRQ")
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200928101701.13540-1-cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2020-09-28 12:17:01 +02:00
parent 20d143e2ca
commit c8726f7b24
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/vfio/ccw.c
View File

@ -491,6 +491,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
vcdev->io_region_offset = info->offset; vcdev->io_region_offset = info->offset;
vcdev->io_region = g_malloc0(info->size); vcdev->io_region = g_malloc0(info->size);
g_free(info);
/* check for the optional async command region */ /* check for the optional async command region */
ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW, 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_offset = info->offset;
vcdev->async_cmd_region = g_malloc0(info->size); vcdev->async_cmd_region = g_malloc0(info->size);
g_free(info);
} }
ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW, 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_offset = info->offset;
vcdev->schib_region = g_malloc(info->size); vcdev->schib_region = g_malloc(info->size);
g_free(info);
} }
ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW, 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_offset = info->offset;
vcdev->crw_region = g_malloc(info->size); vcdev->crw_region = g_malloc(info->size);
g_free(info);
} }
g_free(info);
return; return;
out_err: out_err: