qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, eblake@redhat.com, jcody@redhat.com,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v3 1/4] block: Fix anonymous BBs in blk_root_inactivate()
Date: Wed, 31 May 2017 11:52:44 +0200	[thread overview]
Message-ID: <1496224367-24935-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1496224367-24935-1-git-send-email-kwolf@redhat.com>

blk->name isn't an array, but a pointer that can be NULL. Checking for
an anonymous BB must involve a NULL check first, otherwise we get
crashes.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/block-backend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/block-backend.c b/block/block-backend.c
index f3a6008..7d7f369 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -168,7 +168,7 @@ static int blk_root_inactivate(BdrvChild *child)
      * this point because the VM is stopped) and unattached monitor-owned
      * BlockBackends. If there is still any other user like a block job, then
      * we simply can't inactivate the image. */
-    if (!blk->dev && !blk->name[0]) {
+    if (!blk->dev && !blk_name(blk)[0]) {
         return -EPERM;
     }
 
-- 
1.8.3.1

  reply	other threads:[~2017-05-31  9:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-31  9:52 [Qemu-devel] [PATCH v3 0/4] Block migration (migrate -b) fixes Kevin Wolf
2017-05-31  9:52 ` Kevin Wolf [this message]
2017-05-31  9:52 ` [Qemu-devel] [PATCH v3 2/4] migration: Inactivate images after .save_live_complete_precopy() Kevin Wolf
2017-05-31  9:52 ` [Qemu-devel] [PATCH v3 3/4] migration/block: Clean up BBs in block_save_complete() Kevin Wolf
2017-05-31  9:52 ` [Qemu-devel] [PATCH v3 4/4] qemu-iotests: Block migration test Kevin Wolf
2017-05-31 13:27   ` Jeff Cody
2017-05-31 17:03   ` Eric Blake
2017-06-01  8:59     ` 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=1496224367-24935-2-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jcody@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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).