From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:45512)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQJM-000398-Lh
	for qemu-devel@nongnu.org; Mon, 21 May 2012 06:58:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQJH-0001Kk-SV
	for qemu-devel@nongnu.org; Mon, 21 May 2012 06:58:00 -0400
Received: from mx1.redhat.com ([209.132.183.28]:17142)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQJH-0001Kc-KM
	for qemu-devel@nongnu.org; Mon, 21 May 2012 06:57:55 -0400
Message-ID: <4FBA1FAD.20106@redhat.com>
Date: Mon, 21 May 2012 12:57:49 +0200
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <1337173681-25891-1-git-send-email-jim@meyering.net>
	<1337173681-25891-2-git-send-email-jim@meyering.net>
In-Reply-To: <1337173681-25891-2-git-send-email-jim@meyering.net>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/6] qcow2: don't leak buffer for
 unexpected qcow_version in header
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jim Meyering <jim@meyering.net>
Cc: Jim Meyering <meyering@redhat.com>, qemu-devel@nongnu.org

Am 16.05.2012 15:07, schrieb Jim Meyering:
> From: Jim Meyering <meyering@redhat.com>
> 
> 
> Signed-off-by: Jim Meyering <meyering@redhat.com>
> ---
>  block/qcow2.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 655799c..f3388bf 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -919,6 +919,7 @@ int qcow2_update_header(BlockDriverState *bs)
>          ret = sizeof(*header);
>          break;
>      default:
> +        free(buf);
>          return -EINVAL;
>      }
> 

buf was allocated with qemu_blockalign(), so it must be freed with
qemu_vfree(). But instead of open-coding it here, this place should work
like all other places in the same function:

ret = -EINVAL;
goto fail;

Kevin