[Qemu-devel] [PULL for-2.8 0/2] usb: two memory leak fixes.

[Qemu-devel] [PULL for-2.8 0/2] usb: two memory leak fixes.

[Gerd Hoffmann]

  Hi,

Here is the usb patch queue, fixing two memory leaks.

please pull,
  Gerd

The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:

  Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-usb-20161109-1

for you to fetch changes up to f0bf4999eae156142a86290fda45de4094e3e8b4:

  usbredir: free vm_change_state_handler in usbredir destroy dispatch (2016-11-08 15:01:23 +0100)

----------------------------------------------------------------
usb: two memory leak fixes.

----------------------------------------------------------------
Li Qiang (2):
      usb: ehci: fix memory leak in ehci_init_transfer
      usbredir: free vm_change_state_handler in usbredir destroy dispatch

 hw/usb/hcd-ehci.c | 1 +
 hw/usb/redirect.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/2] usb: ehci: fix memory leak in ehci_init_transfer

[Gerd Hoffmann]

From: Li Qiang <liqiang6-s@360.cn>

In ehci_init_transfer function, if the 'cpage' is bigger than 4,
it doesn't free the 'p->sgl' once allocated previously thus leading
a memory leak issue. This patch avoid this.

Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Message-id: 5821c0f4.091c6b0a.e0c92.e811@mx.google.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/hcd-ehci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index f4ece9a..7622a3a 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1190,6 +1190,7 @@ static int ehci_init_transfer(EHCIPacket *p)
     while (bytes > 0) {
         if (cpage > 4) {
             fprintf(stderr, "cpage out of range (%d)\n", cpage);
+            qemu_sglist_destroy(&p->sgl);
             return -1;
         }
 
-- 
1.8.3.1

[Qemu-devel] [PULL 2/2] usbredir: free vm_change_state_handler in usbredir destroy dispatch

[Gerd Hoffmann]

From: Li Qiang <liqiang6-s@360.cn>

In usbredir destroy dispatch function, it doesn't free the vm change
state handler once registered in usbredir_realize function. This will
lead a memory leak issue. This patch avoid this.

Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 58216976.d0236b0a.77b99.bcd6@mx.google.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/redirect.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 528081e..a657237 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -132,6 +132,7 @@ struct USBRedirDevice {
     struct usbredirfilter_rule *filter_rules;
     int filter_rules_count;
     int compatible_speedmask;
+    VMChangeStateEntry *vmstate;
 };
 
 #define TYPE_USB_REDIR "usb-redir"
@@ -1411,7 +1412,8 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
                              usbredir_chardev_read, usbredir_chardev_event,
                              dev, NULL, true);
 
-    qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
+    dev->vmstate =
+        qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
 }
 
 static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
@@ -1450,6 +1452,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
     }
 
     free(dev->filter_rules);
+    qemu_del_vm_change_state_handler(dev->vmstate);
 }
 
 static int usbredir_check_filter(USBRedirDevice *dev)
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-2.8 0/2] usb: two memory leak fixes.

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]

On Wed, Nov 09, 2016 at 02:33:29PM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> Here is the usb patch queue, fixing two memory leaks.
> 
> please pull,
>   Gerd
> 
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
> 
>   Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
> 
> are available in the git repository at:
> 
> 
>   git://git.kraxel.org/qemu tags/pull-usb-20161109-1
> 
> for you to fetch changes up to f0bf4999eae156142a86290fda45de4094e3e8b4:
> 
>   usbredir: free vm_change_state_handler in usbredir destroy dispatch (2016-11-08 15:01:23 +0100)
> 
> ----------------------------------------------------------------
> usb: two memory leak fixes.
> 
> ----------------------------------------------------------------
> Li Qiang (2):
>       usb: ehci: fix memory leak in ehci_init_transfer
>       usbredir: free vm_change_state_handler in usbredir destroy dispatch
> 
>  hw/usb/hcd-ehci.c | 1 +
>  hw/usb/redirect.c | 5 ++++-
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]