From: Bandan Das Date: Fri, 23 Feb 2018 16:48:26 +0000 (-0500) Subject: usb-mtp: print parent path in IN_IGNORED trace fn X-Git-Tag: v2.12.0-rc0~66^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d13ebeacc22eb854e5d70b18fda1af22a46dc27;p=thirdparty%2Fqemu.git 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 Message-id: 20180223164829.29683-3-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- 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: