From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Bandan Das <bsd@redhat.com>
Subject: [Qemu-devel] [PULL 3/4] usb-mtp: prevent null dereference while deleting objects
Date: Thu, 7 Mar 2019 10:54:40 +0100 [thread overview]
Message-ID: <20190307095441.31921-4-kraxel@redhat.com> (raw)
In-Reply-To: <20190307095441.31921-1-kraxel@redhat.com>
From: Bandan Das <bsd@redhat.com>
Spotted by Coverity: CID 1399144
Signed-off-by: Bandan Das <bsd@redhat.com>
Message-id: 20190306210409.14842-4-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-mtp.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 1f22284949df..06e376bcd211 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1177,9 +1177,7 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans)
usb_mtp_object_free_one(s, o);
success = true;
}
- }
-
- if (o->format == FMT_ASSOCIATION) {
+ } else if (o->format == FMT_ASSOCIATION) {
if (rmdir(o->path)) {
partial_delete = true;
} else {
--
2.18.1
next prev parent reply other threads:[~2019-03-07 9:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-07 9:54 [Qemu-devel] [PULL 0/4] Usb 20190307 patches Gerd Hoffmann
2019-03-07 9:54 ` [Qemu-devel] [PULL 1/4] usb-mtp: return incomplete transfer on a lstat failure Gerd Hoffmann
2019-03-07 9:54 ` [Qemu-devel] [PULL 2/4] usb-mtp: fix some usb_mtp_write_data return paths Gerd Hoffmann
2019-03-08 17:37 ` Peter Maydell
2019-03-08 19:39 ` Bandan Das
2019-03-07 9:54 ` Gerd Hoffmann [this message]
2019-03-08 17:06 ` [Qemu-devel] [PULL 3/4] usb-mtp: prevent null dereference while deleting objects Peter Maydell
2019-03-08 19:46 ` Bandan Das
2019-03-08 22:14 ` [Qemu-devel] [PATCH] usb-mtp: fix return status of delete Bandan Das
2019-03-09 14:13 ` Peter Maydell
2019-03-11 16:14 ` Bandan Das
2019-03-11 16:25 ` Peter Maydell
2019-03-11 16:42 ` Bandan Das
2019-03-11 17:18 ` Peter Maydell
2019-03-11 17:39 ` Bandan Das
2019-03-11 17:55 ` Peter Maydell
2019-03-11 18:11 ` Bandan Das
2019-03-11 18:56 ` Peter Maydell
2019-03-11 23:02 ` Bandan Das
2019-03-09 14:08 ` [Qemu-devel] [PULL 3/4] usb-mtp: prevent null dereference while deleting objects Peter Maydell
2019-03-07 9:54 ` [Qemu-devel] [PULL 4/4] Introduce new "no_guest_reset" parameter for usb-host device Gerd Hoffmann
2019-03-07 15:21 ` [Qemu-devel] [PULL 0/4] Usb 20190307 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190307095441.31921-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=bsd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).