qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	benoit.canet@irqsave.net, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v3 1/3] nfs: Fix leak of opts in nfs_file_open
Date: Thu, 28 Aug 2014 13:56:10 +0800	[thread overview]
Message-ID: <1409205372-15508-2-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1409205372-15508-1-git-send-email-famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/nfs.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index 93d87f3..194f301 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -393,16 +393,20 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,
     qemu_opts_absorb_qdict(opts, options, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
-        return -EINVAL;
+        ret = -EINVAL;
+        goto out;
     }
     ret = nfs_client_open(client, qemu_opt_get(opts, "filename"),
                           (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
                           errp);
     if (ret < 0) {
-        return ret;
+        goto out;
     }
     bs->total_sectors = ret;
-    return 0;
+    ret = 0;
+out:
+    qemu_opts_del(opts);
+    return ret;
 }
 
 static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp)
-- 
2.1.0

  reply	other threads:[~2014-08-28  5:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-28  5:56 [Qemu-devel] [PATCH v3 0/3] block: Fix leaks of opts in block drivers Fam Zheng
2014-08-28  5:56 ` Fam Zheng [this message]
2014-08-28  6:43   ` [Qemu-devel] [PATCH v3 1/3] nfs: Fix leak of opts in nfs_file_open Benoît Canet
2014-08-28  5:56 ` [Qemu-devel] [PATCH v3 2/3] blkverify: Fix leak of opts in blkverify_open Fam Zheng
2014-08-28  5:56 ` [Qemu-devel] [PATCH v3 3/3] quorum: Fix leak of opts in quorum_open Fam Zheng
2014-08-29 16:10 ` [Qemu-devel] [PATCH v3 0/3] block: Fix leaks of opts in block drivers Stefan Hajnoczi

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=1409205372-15508-2-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=benoit.canet@irqsave.net \
    --cc=kwolf@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).