From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMr4e-00087B-O0 for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMr4Y-0008Qy-JP for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:12:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMr4Y-0008Qu-Bx for qemu-devel@nongnu.org; Thu, 28 Aug 2014 00:12:30 -0400 From: Fam Zheng Date: Thu, 28 Aug 2014 12:12:36 +0800 Message-Id: <1409199158-23453-2-git-send-email-famz@redhat.com> In-Reply-To: <1409199158-23453-1-git-send-email-famz@redhat.com> References: <1409199158-23453-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/3] nfs: Fix leak of opts in nfs_file_open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , benoit.canet@irqsave.net, Stefan Hajnoczi Signed-off-by: Fam Zheng --- block/nfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 93d87f3..8740c1a 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -393,15 +393,19 @@ 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; + ret = 0; +out: + qemu_opts_del(opts); return 0; } -- 2.1.0