[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 14/21] raw-win32: Handle failure for potentia
From: |
Kevin Wolf |
Subject: |
Re: [Qemu-devel] [PATCH v4 14/21] raw-win32: Handle failure for potentially large allocations |
Date: |
Fri, 6 Jun 2014 11:53:47 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Am 05.06.2014 um 17:09 hat Benoît Canet geschrieben:
> The Thursday 05 Jun 2014 à 15:36:26 (+0200), Kevin Wolf wrote :
> > Some code in the block layer makes potentially huge allocations. Failure
> > is not completely unexpected there, so avoid aborting qemu and handle
> > out-of-memory situations gracefully.
> >
> > This patch addresses the allocations in the raw-win32 block driver.
> >
> > Signed-off-by: Kevin Wolf <address@hidden>
> > Reviewed-by: Stefan Hajnoczi <address@hidden>
> > ---
> > block/win32-aio.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > 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(BlockDriverState
> > *bs,
> > waiocb->is_read = (type == QEMU_AIO_READ);
> >
> > if (qiov->niov > 1) {
> > - waiocb->buf = qemu_blockalign(bs, qiov->size);
> > + waiocb->buf = qemu_try_blockalign(bs, qiov->size);
> > + if (waiocb->buf == NULL) {
> > + goto out;
> > + }
> > if (type & QEMU_AIO_WRITE) {
> > iov_to_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size);
> > }
> > @@ -167,6 +170,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs,
> >
> > out_dec_count:
> > aio->count--;
> Isn't waiocb->buf leaked on this path ?
The already existing error path you mean? Looks like it, feel free to
send a patch.
Kevin
> > +out:
> > qemu_aio_release(waiocb);
> > return NULL;
> > }
> > --
> > 1.8.3.1
> >
> >
- Re: [Qemu-devel] [PATCH v4 10/21] qcow1: Handle failure for potentially large allocations, (continued)
- [Qemu-devel] [PATCH v4 12/21] qed: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 11/21] qcow2: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 13/21] raw-posix: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 14/21] raw-win32: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 16/21] vdi: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 15/21] rbd: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 17/21] vhdx: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 18/21] vmdk: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 19/21] vpc: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 21/21] qcow2: Return useful error code in refcount_init(), Kevin Wolf, 2014/06/05
- [Qemu-devel] [PATCH v4 20/21] mirror: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/05
- Re: [Qemu-devel] [PATCH v4 00/21] block: Handle failure for potentially large allocations, Stefan Hajnoczi, 2014/06/11