From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMWJX-00030t-Q2 for qemu-devel@nongnu.org; Wed, 27 Aug 2014 02:02:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMWJQ-0000O4-Ia for qemu-devel@nongnu.org; Wed, 27 Aug 2014 02:02:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMWJQ-0000No-B1 for qemu-devel@nongnu.org; Wed, 27 Aug 2014 02:02:28 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7R62Q9G027868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 27 Aug 2014 02:02:27 -0400 From: Fam Zheng Date: Wed, 27 Aug 2014 14:02:33 +0800 Message-Id: <1409119356-22742-2-git-send-email-famz@redhat.com> In-Reply-To: <1409119356-22742-1-git-send-email-famz@redhat.com> References: <1409119356-22742-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] 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 , Stefan Hajnoczi Signed-off-by: Fam Zheng --- block/nfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 93d87f3..36e8057 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -393,15 +393,18 @@ 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; +out: + qemu_opts_del(opts); return 0; } -- 2.1.0