| Message ID | 20240522044015.412951-4-zhenzhong.duan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | VFIO: misc cleanups part2 | expand |
On 5/22/24 06:39, Zhenzhong Duan wrote: > Local pointer irq_set is freed before return from > vfio_set_irq_signaling(). > > Use 'g_autofree' to avoid the g_free() calls. > > Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/vfio/helpers.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c > index 47b4096c05..1f3bdd9bf0 100644 > --- a/hw/vfio/helpers.c > +++ b/hw/vfio/helpers.c > @@ -111,7 +111,7 @@ int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, > int action, int fd, Error **errp) > { > ERRP_GUARD(); > - struct vfio_irq_set *irq_set; > + g_autofree struct vfio_irq_set *irq_set = NULL; > int argsz, ret = 0; > const char *name; > int32_t *pfd; > @@ -130,7 +130,6 @@ int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, > if (ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) { > ret = -errno; > } > - g_free(irq_set); > > if (!ret) { > return 0;
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index 47b4096c05..1f3bdd9bf0 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -111,7 +111,7 @@ int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, int action, int fd, Error **errp) { ERRP_GUARD(); - struct vfio_irq_set *irq_set; + g_autofree struct vfio_irq_set *irq_set = NULL; int argsz, ret = 0; const char *name; int32_t *pfd; @@ -130,7 +130,6 @@ int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, if (ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) { ret = -errno; } - g_free(irq_set); if (!ret) { return 0;
Local pointer irq_set is freed before return from vfio_set_irq_signaling(). Use 'g_autofree' to avoid the g_free() calls. Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> --- hw/vfio/helpers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)