From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzpwM-0004Ex-BB for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:57:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzpwL-0007sA-8I for qemu-devel@nongnu.org; Fri, 20 Nov 2015 12:57:42 -0500 References: <1448024015-31081-1-git-send-email-armbru@redhat.com> From: Eric Blake Message-ID: <564F5F0B.1080305@redhat.com> Date: Fri, 20 Nov 2015 10:57:31 -0700 MIME-Version: 1.0 In-Reply-To: <1448024015-31081-1-git-send-email-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="x78r3emFIe4jq2QNrUvBMo8nE5U0QthM8" Subject: Re: [Qemu-devel] [PATCH for-2.5] block/qapi: Plug memory leak on query-block error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --x78r3emFIe4jq2QNrUvBMo8nE5U0QthM8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/20/2015 05:53 AM, Markus Armbruster wrote: > Spotted by Coverity. >=20 > Signed-off-by: Markus Armbruster > --- > block/qapi.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) >=20 > diff --git a/block/qapi.c b/block/qapi.c > index d20262d..267f147 100644 > --- a/block/qapi.c > +++ b/block/qapi.c > @@ -436,7 +436,9 @@ BlockInfoList *qmp_query_block(Error **errp) > bdrv_query_info(blk, &info->value, &local_err); > if (local_err) { > error_propagate(errp, local_err); > - goto err; > + g_free(info); > + qapi_free_BlockInfoList(head); > + return NULL; > } > =20 Only info was leaked, but inlining the entire 'err' label into its one use was easier than hoisting the declaration of info out of the loop. Reviewed-by: Eric Blake > *p_next =3D info; > @@ -444,10 +446,6 @@ BlockInfoList *qmp_query_block(Error **errp) > } > =20 > return head; > - > - err: > - qapi_free_BlockInfoList(head); > - return NULL; > } > =20 > BlockStatsList *qmp_query_blockstats(bool has_query_nodes, >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --x78r3emFIe4jq2QNrUvBMo8nE5U0QthM8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJWT18LAAoJEKeha0olJ0NqvzcH/1FifMnCeD2c9n1NOhXQraYZ BvkIlHwOuz80GKTYdUIWc/+ab8iUZqptW9MREsB/UzMxXr7GffpFx3wXmI8GN/ij HgWPj/eY/ODTWLP5mpDPsXYig9IB+8MK7VCQFsr3cIRtpTQLHZtwXOyEtym+6Q1y 2wHS5tTcpMeMuhnfgB0CK8eiQtXcXvzzDbNAr2borem5c/eUlk1r7g5Klbc6lbEV iD/IoJboQ/cP94EryvtSrapo1ylHva+uw4S9pv6l5YRHgmPr23UNXm1YaYntz0d1 1Gf+AU6SjRw1L9psCHzP4FWk1QTpx85HNJE6vTwMc0EwBLcGwCYrH00V+KhXLWQ= =gvcI -----END PGP SIGNATURE----- --x78r3emFIe4jq2QNrUvBMo8nE5U0QthM8--