aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBandan Das <bsd@redhat.com>2018-02-23 11:48:26 -0500
committerGerd Hoffmann <kraxel@redhat.com>2018-02-26 12:18:36 +0100
commit5d13ebeacc22eb854e5d70b18fda1af22a46dc27 (patch)
tree6aa0e24e2f85ce855556f66e02e1940eb64fb7fc
parent9c72758439c44f48f095d9d85e5e20d8050ab93a (diff)
downloadqemu-5d13ebeacc22eb854e5d70b18fda1af22a46dc27.tar.gz
usb-mtp: print parent path in IN_IGNORED trace fn
Fix a possible null dereference when deleting a folder and its contents. An ignored event might be received for its contents after the parent folder is deleted which will return a null object. Signed-off-by: Bandan Das <bsd@redhat.com> Message-id: 20180223164829.29683-3-bsd@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb/dev-mtp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index b55aa8205e7..63f8f3b90b5 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -540,9 +540,8 @@ static void inotify_watchfn(void *arg)
break;
case IN_IGNORED:
- o = usb_mtp_object_lookup_name(parent, event->name, event->len);
- trace_usb_mtp_inotify_event(s->dev.addr, o->path,
- event->mask, "Obj ignored");
+ trace_usb_mtp_inotify_event(s->dev.addr, parent->path,
+ event->mask, "Obj parent dir ignored");
break;
default: