Commit 9efaf7f5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/leaks-for-2.7-pull-request' into staging 



# gpg: Signature made Sun 07 Aug 2016 21:03:14 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/leaks-for-2.7-pull-request:
  ahci: fix sglist leak on retry
  usb: free leaking path
  usb: free USBDevice.strings
  virtio-input: free config list
  qjson: free str
  ahci: free irqs array
  char: free MuxDriver when closing
  char: free the tcp connection data when closing
  numa: do not leak NumaOptions

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cbda16c0 5839df7b

hw/ide/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ static void ncq_err(NCQTransferState *ncq_tfs) 
    ide_state->error = ABRT_ERR;

    ide_state->status = READY_STAT | ERR_STAT;

    ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);

    qemu_sglist_destroy(&ncq_tfs->sglist);

    ncq_tfs->used = 0;

}
@@ -1025,7 +1026,6 @@ static void execute_ncq_command(NCQTransferState *ncq_tfs) 
    default:

        DPRINTF(port, "error: unsupported NCQ command (0x%02x) received\n",

                ncq_tfs->cmd);

        qemu_sglist_destroy(&ncq_tfs->sglist);

        ncq_err(ncq_tfs);

    }

}
@@ -1092,7 +1092,6 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, 
        error_report("ahci: PRDT length for NCQ command (0x%zx) "

                     "is smaller than the requested size (0x%zx)",

                     ncq_tfs->sglist.size, size);

        qemu_sglist_destroy(&ncq_tfs->sglist);

        ncq_err(ncq_tfs);

        ahci_trigger_irq(ad->hba, ad, PORT_IRQ_OVERFLOW);

        return;
@@ -1478,6 +1477,7 @@ void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) 
        ad->port.dma->ops = &ahci_dma_ops;

        ide_register_restart_cb(&ad->port);

    }

    g_free(irqs);

}



void ahci_uninit(AHCIState *s)

hw/ide/core.c

+1 −0
Original line number Diff line number Diff line
@@ -824,6 +824,7 @@ static void ide_dma_cb(void *opaque, int ret) 
    if (ret < 0) {

        if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) {

            s->bus->dma->aiocb = NULL;

            dma_buf_commit(s, 0);

            return;

        }

    }

hw/input/virtio-input.c

+11 −0
Original line number Diff line number Diff line
@@ -270,6 +270,16 @@ static void virtio_input_device_realize(DeviceState *dev, Error **errp) 
    vinput->sts = virtio_add_queue(vdev, 64, virtio_input_handle_sts);

}



static void virtio_input_finalize(Object *obj)

{

    VirtIOInput *vinput = VIRTIO_INPUT(obj);

    VirtIOInputConfig *cfg, *next;



    QTAILQ_FOREACH_SAFE(cfg, &vinput->cfg_list, node, next) {

        QTAILQ_REMOVE(&vinput->cfg_list, cfg, node);

        g_free(cfg);

    }

}

static void virtio_input_device_unrealize(DeviceState *dev, Error **errp)

{

    VirtIOInputClass *vic = VIRTIO_INPUT_GET_CLASS(dev);
@@ -318,6 +328,7 @@ static const TypeInfo virtio_input_info = { 
    .class_size    = sizeof(VirtIOInputClass),

    .class_init    = virtio_input_class_init,

    .abstract      = true,

    .instance_finalize = virtio_input_finalize,

};



/* ----------------------------------------------------------------- */

hw/usb/bus.c

+7 −0
Original line number Diff line number Diff line
@@ -279,6 +279,13 @@ static void usb_qdev_realize(DeviceState *qdev, Error **errp) 
static void usb_qdev_unrealize(DeviceState *qdev, Error **errp)

{

    USBDevice *dev = USB_DEVICE(qdev);

    USBDescString *s, *next;



    QLIST_FOREACH_SAFE(s, &dev->strings, next, next) {

        QLIST_REMOVE(s, next);

        g_free(s->str);

        g_free(s);

    }



    if (dev->attached) {

        usb_device_detach(dev);

hw/usb/desc.c

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ void usb_desc_create_serial(USBDevice *dev) 
    }

    dst += snprintf(serial+dst, sizeof(serial)-dst, "-%s", dev->port->path);

    usb_desc_set_string(dev, index, serial);

    g_free(path);

}



const char *usb_desc_get_string(USBDevice *dev, uint8_t index)