From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsZHz-0001cr-5q
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:09:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsZHr-0004Pw-Ir
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:09:11 -0400
Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:46251 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsZHr-0004Pl-DJ
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:09:03 -0400
Date: Thu, 5 Jun 2014 17:09:02 +0200
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140605150902.GD6430@irqsave.net>
References: <1401975393-7255-1-git-send-email-kwolf@redhat.com>
	<1401975393-7255-15-git-send-email-kwolf@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1401975393-7255-15-git-send-email-kwolf@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v4 14/21] raw-win32: Handle failure for
 potentially large allocations
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: Kevin Wolf <kwolf@redhat.com>
Cc: benoit.canet@irqsave.net, qemu-devel@nongnu.org, stefanha@redhat.com

The Thursday 05 Jun 2014 =E0 15:36:26 (+0200), Kevin Wolf wrote :
> Some code in the block layer makes potentially huge allocations. Failur=
e
> is not completely unexpected there, so avoid aborting qemu and handle
> out-of-memory situations gracefully.
>=20
> This patch addresses the allocations in the raw-win32 block driver.
>=20
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/win32-aio.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>=20
> diff --git a/block/win32-aio.c b/block/win32-aio.c
> index 5d1d199..b8320ce 100644
> --- a/block/win32-aio.c
> +++ b/block/win32-aio.c
> @@ -138,7 +138,10 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverStat=
e *bs,
>      waiocb->is_read =3D (type =3D=3D QEMU_AIO_READ);
> =20
>      if (qiov->niov > 1) {
> -        waiocb->buf =3D qemu_blockalign(bs, qiov->size);
> +        waiocb->buf =3D qemu_try_blockalign(bs, qiov->size);
> +        if (waiocb->buf =3D=3D NULL) {
> +            goto out;
> +        }
>          if (type & QEMU_AIO_WRITE) {
>              iov_to_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->si=
ze);
>          }
> @@ -167,6 +170,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState=
 *bs,
> =20
>  out_dec_count:
>      aio->count--;
Isn't waiocb->buf leaked on this path ?
> +out:
>      qemu_aio_release(waiocb);
>      return NULL;
>  }
> --=20
> 1.8.3.1
>=20
>=20