qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, lersek@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH] blkdebug: Don't leak bs->file on failure
Date: Sat,  8 Feb 2014 09:54:30 +0100	[thread overview]
Message-ID: <1391849670-10352-1-git-send-email-kwolf@redhat.com> (raw)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/blkdebug.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 56c4cd0..519b483 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -414,7 +414,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
                           flags, true, false, &local_err);
     if (ret < 0) {
         error_propagate(errp, local_err);
-        goto fail;
+        goto fail_unref;
     }
 
     /* Set request alignment */
@@ -424,10 +424,13 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
     } else {
         error_setg(errp, "Invalid alignment");
         ret = -EINVAL;
-        goto fail;
+        goto fail_unref;
     }
 
-    ret = 0;
+    return 0;
+
+fail_unref:
+    bdrv_unref(bs->file);
 fail:
     qemu_opts_del(opts);
     return ret;
-- 
1.8.1.4

             reply	other threads:[~2014-02-08  8:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-08  8:54 Kevin Wolf [this message]
2014-02-08  9:46 ` [Qemu-devel] [PATCH] blkdebug: Don't leak bs->file on failure Laszlo Ersek
2014-02-08  9:55   ` Kevin Wolf
2014-02-08  9:57     ` Laszlo Ersek

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=1391849670-10352-1-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=lersek@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).