ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio/pci: fix use of freed memory 

hw/vfio/pci.c:308:29: warning: Use of memory after it is freed
        qemu_set_fd_handler(*pfd, NULL, NULL, vdev);
                            ^~~~

Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2017-07-26 11:38:18 -06:00 committed by Alex Williamson
parent 418c69813f
commit 96d2c2c574
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/vfio/pci.c
View File

@ -257,7 +257,7 @@ static void vfio_intx_update(PCIDevice *pdev)
static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
{ {
uint8_t pin = vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1); uint8_t pin = vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1);
int ret, argsz; int ret, argsz, retval = 0;
struct vfio_irq_set *irq_set; struct vfio_irq_set *irq_set;
int32_t *pfd; int32_t *pfd;
Error *err = NULL; Error *err = NULL;
@ -302,12 +302,12 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
qemu_set_fd_handler(*pfd, vfio_intx_interrupt, NULL, vdev); qemu_set_fd_handler(*pfd, vfio_intx_interrupt, NULL, vdev);
ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set);
g_free(irq_set);
if (ret) { if (ret) {
error_setg_errno(errp, -ret, "failed to setup INTx fd"); error_setg_errno(errp, -ret, "failed to setup INTx fd");
qemu_set_fd_handler(*pfd, NULL, NULL, vdev); qemu_set_fd_handler(*pfd, NULL, NULL, vdev);
event_notifier_cleanup(&vdev->intx.interrupt); event_notifier_cleanup(&vdev->intx.interrupt);
return -errno; retval = -errno;
goto cleanup;
} }
vfio_intx_enable_kvm(vdev, &err); vfio_intx_enable_kvm(vdev, &err);
@ -319,7 +319,10 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
trace_vfio_intx_enable(vdev->vbasedev.name); trace_vfio_intx_enable(vdev->vbasedev.name);
return 0; cleanup:
g_free(irq_set);
return retval;
} }
static void vfio_intx_disable(VFIOPCIDevice *vdev) static void vfio_intx_disable(VFIOPCIDevice *vdev)