From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP59-0000KQ-RX for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNP54-00034Z-Bx for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:31:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP54-00034F-5m for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:31:18 -0400 From: Stefan Hajnoczi Date: Fri, 29 Aug 2014 17:30:01 +0100 Message-Id: <1409329803-20744-34-git-send-email-stefanha@redhat.com> In-Reply-To: <1409329803-20744-1-git-send-email-stefanha@redhat.com> References: <1409329803-20744-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 33/35] 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: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng Signed-off-by: Fam Zheng Reviewed-by: Beno=C3=AEt Canet Signed-off-by: Stefan Hajnoczi --- 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, QDic= t *options, int flags, qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { error_propagate(errp, local_err); - return -EINVAL; + ret =3D -EINVAL; + goto out; } ret =3D 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 =3D ret; - return 0; + ret =3D 0; +out: + qemu_opts_del(opts); + return ret; } =20 static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp= ) --=20 1.9.3