From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org,
qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
Date: Fri, 5 Apr 2019 13:45:13 +0200 [thread overview]
Message-ID: <20190405114513.3141-1-armbru@redhat.com> (raw)
drive_new() returns null without setting an error when it provided
help. add_init_drive() assumes null means failure, and crashes trying
to report a null error.
Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
device-hotplug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/device-hotplug.c b/device-hotplug.c
index 6090d5f1e9..6153259d71 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
mc = MACHINE_GET_CLASS(current_machine);
dinfo = drive_new(opts, mc->block_default_type, &err);
- if (!dinfo) {
+ if (err) {
error_report_err(err);
qemu_opts_del(opts);
return NULL;
--
2.17.2
WARNING: multiple messages have this Message-ID (diff)
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-stable@nongnu.org, qemu-block@nongnu.org,
mreitz@redhat.com
Subject: [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash
Date: Fri, 5 Apr 2019 13:45:13 +0200 [thread overview]
Message-ID: <20190405114513.3141-1-armbru@redhat.com> (raw)
Message-ID: <20190405114513.7A6Xyotc838YvV7B9b6x_pYzKcOCD7qmvhhSYudbgTs@z> (raw)
drive_new() returns null without setting an error when it provided
help. add_init_drive() assumes null means failure, and crashes trying
to report a null error.
Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
device-hotplug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/device-hotplug.c b/device-hotplug.c
index 6090d5f1e9..6153259d71 100644
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -48,7 +48,7 @@ static DriveInfo *add_init_drive(const char *optstr)
mc = MACHINE_GET_CLASS(current_machine);
dinfo = drive_new(opts, mc->block_default_type, &err);
- if (!dinfo) {
+ if (err) {
error_report_err(err);
qemu_opts_del(opts);
return NULL;
--
2.17.2
next reply other threads:[~2019-04-05 11:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 11:45 Markus Armbruster [this message]
2019-04-05 11:45 ` [Qemu-devel] [PATCH for-4.0] hmp: Fix drive_add ... format=help crash Markus Armbruster
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 12:51 ` Kevin Wolf
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:11 ` Dr. David Alan Gilbert
2019-04-05 16:24 ` Kevin Wolf
2019-04-05 16:24 ` Kevin Wolf
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=20190405114513.3141-1-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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).