diff mbox series

[v2,3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus

Message ID 1575444716-17632-3-git-send-email-pannengyuan@huawei.com (mailing list archive)
State New, archived
Headers show
Series [v2,1/3] virtio: add ability to delete vq through a pointer | expand

Commit Message

Pan Nengyuan Dec. 4, 2019, 7:31 a.m. UTC 
From: Pan Nengyuan <pannengyuan@huawei.com>

ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in
virtio_serial_device_unrealize, the memory leak stack is as bellow:

Direct leak of 1290240 byte(s) in 180 object(s) allocated from:
    #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
    #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
    #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327
    #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089
    #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504
    #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876
    #6 0x5650e0531efd in property_set_bool qom/object.c:2080
    #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26
    #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338
    #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Amit Shah <amit@kernel.org>
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
Changes v2 to v1:
- use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
  Michael S. Tsirkin)
---
 hw/char/virtio-serial-bus.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Laurent Vivier Dec. 4, 2019, 10:17 a.m. UTC | #1 
On 04/12/2019 08:31, pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
> 
> ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in
> virtio_serial_device_unrealize, the memory leak stack is as bellow:
> 
> Direct leak of 1290240 byte(s) in 180 object(s) allocated from:
>     #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
>     #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
>     #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327
>     #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089
>     #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504
>     #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876
>     #6 0x5650e0531efd in property_set_bool qom/object.c:2080
>     #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26
>     #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338
>     #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801
> 
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Laurent Vivier <lvivier@redhat.com>
> Cc: Amit Shah <amit@kernel.org>
> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Changes v2 to v1:
> - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
>   Michael S. Tsirkin)
> ---
>  hw/char/virtio-serial-bus.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
> index 3325904..e1cbce3 100644
> --- a/hw/char/virtio-serial-bus.c
> +++ b/hw/char/virtio-serial-bus.c
> @@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
>  {
>      VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>      VirtIOSerial *vser = VIRTIO_SERIAL(dev);
> +    int i;
>  
>      QLIST_REMOVE(vser, next);
>  
> +    virtio_delete_queue(vser->c_ivq);
> +    virtio_delete_queue(vser->c_ovq);
> +    for (i = 0; i < vser->bus.max_nr_ports; i++) {
> +        virtio_delete_queue(vser->ivqs[i]);
> +        virtio_delete_queue(vser->ovqs[i]);
> +    }
> +
>      g_free(vser->ivqs);
>      g_free(vser->ovqs);
>      g_free(vser->ports_map);
> 

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Eric Blake Dec. 4, 2019, 2:41 p.m. UTC | #2 
On 12/4/19 1:31 AM, pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
> 
> ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in

s/is //

> virtio_serial_device_unrealize, the memory leak stack is as bellow:

below

> 
> Direct leak of 1290240 byte(s) in 180 object(s) allocated from:
>      #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
>      #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
>      #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327
>      #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089
>      #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504
>      #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876
>      #6 0x5650e0531efd in property_set_bool qom/object.c:2080
>      #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26
>      #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338
>      #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801
> 
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Laurent Vivier <lvivier@redhat.com>
> Cc: Amit Shah <amit@kernel.org>
> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
Michael S. Tsirkin Dec. 9, 2019, 4:51 p.m. UTC | #3 
Headers are wrong for this one: charset="y" confuses git am.


On Wed, Dec 04, 2019 at 03:31:56PM +0800, pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
> 
> ivqs/ovqs/c_ivq/c_ovq is forgot to cleanup in
> virtio_serial_device_unrealize, the memory leak stack is as bellow:
> 
> Direct leak of 1290240 byte(s) in 180 object(s) allocated from:
>     #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
>     #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
>     #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327
>     #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089
>     #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504
>     #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876
>     #6 0x5650e0531efd in property_set_bool qom/object.c:2080
>     #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26
>     #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338
>     #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801
> 
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Laurent Vivier <lvivier@redhat.com>
> Cc: Amit Shah <amit@kernel.org>
> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Changes v2 to v1:
> - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
>   Michael S. Tsirkin)
> ---
>  hw/char/virtio-serial-bus.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
> index 3325904..e1cbce3 100644
> --- a/hw/char/virtio-serial-bus.c
> +++ b/hw/char/virtio-serial-bus.c
> @@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
>  {
>      VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>      VirtIOSerial *vser = VIRTIO_SERIAL(dev);
> +    int i;
>  
>      QLIST_REMOVE(vser, next);
>  
> +    virtio_delete_queue(vser->c_ivq);
> +    virtio_delete_queue(vser->c_ovq);
> +    for (i = 0; i < vser->bus.max_nr_ports; i++) {
> +        virtio_delete_queue(vser->ivqs[i]);
> +        virtio_delete_queue(vser->ovqs[i]);
> +    }
> +
>      g_free(vser->ivqs);
>      g_free(vser->ovqs);
>      g_free(vser->ports_map);
> -- 
> 2.7.2.windows.1
>
diff mbox series

Patch

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 3325904..e1cbce3 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -1126,9 +1126,17 @@  static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
 {
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     VirtIOSerial *vser = VIRTIO_SERIAL(dev);
+    int i;
 
     QLIST_REMOVE(vser, next);
 
+    virtio_delete_queue(vser->c_ivq);
+    virtio_delete_queue(vser->c_ovq);
+    for (i = 0; i < vser->bus.max_nr_ports; i++) {
+        virtio_delete_queue(vser->ivqs[i]);
+        virtio_delete_queue(vser->ovqs[i]);
+    }
+
     g_free(vser->ivqs);
     g_free(vser->ovqs);
     g_free(vser->ports_map);