Re: [PATCH v3 06/26] usb/dev-mtp: Fix Error double free after inotify failure

2020-06-30 Thread Daniel P . Berrangé
On Tue, Jun 30, 2020 at 11:03:31AM +0200, Markus Armbruster wrote:
> error_report_err() frees its first argument.  Freeing it again is
> wrong.  Don't.
> 
> Fixes: 47287c27d0c367a89f7b2851e23a7f8b2d499dd6
> Cc: Gerd Hoffmann 
> Cc: Daniel P. Berrangé 
> Cc: qemu-sta...@nongnu.org
> Signed-off-by: Markus Armbruster 
> ---
>  hw/usb/dev-mtp.c | 2 --
>  1 file changed, 2 deletions(-)

Reviewed-by: Daniel P. Berrangé 


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|




[PATCH v3 06/26] usb/dev-mtp: Fix Error double free after inotify failure

2020-06-30 Thread Markus Armbruster
error_report_err() frees its first argument.  Freeing it again is
wrong.  Don't.

Fixes: 47287c27d0c367a89f7b2851e23a7f8b2d499dd6
Cc: Gerd Hoffmann 
Cc: Daniel P. Berrangé 
Cc: qemu-sta...@nongnu.org
Signed-off-by: Markus Armbruster 
---
 hw/usb/dev-mtp.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 168428156b..15a2243101 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -634,7 +634,6 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject 
*o)
 error_reportf_err(err,
   "usb-mtp: failed to add watch for %s: ",
   o->path);
-error_free(err);
 } else {
 trace_usb_mtp_file_monitor_event(s->dev.addr, o->path,
  "Watch Added");
@@ -1279,7 +1278,6 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
 if (err) {
 error_reportf_err(err,
   "usb-mtp: file monitoring init failed: ");
-error_free(err);
 } else {
 QTAILQ_INIT(&s->events);
 }
-- 
2.26.2