diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-05-21 18:02:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-15 15:07:15 +0200 |
| commit | 50d4a858e62b1d864227d13f07d2c79c118d046a (patch) | |
| tree | 0e608d2c1c93d093dd0a6d5900bdb67ed8c46efe /block | |
| parent | 4f4896db5fb2285df016ff927508560c89b845a4 (diff) | |
| download | qemu-50d4a858e62b1d864227d13f07d2c79c118d046a.tar.gz qemu-50d4a858e62b1d864227d13f07d2c79c118d046a.tar.bz2 qemu-50d4a858e62b1d864227d13f07d2c79c118d046a.zip | |
raw-posix: Handle failure for potentially large allocations
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-posix block driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 8e9758e920..1194eb00ad 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -798,7 +798,11 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb) * Ok, we have to do it the hard way, copy all segments into * a single aligned buffer. */ - buf = qemu_blockalign(aiocb->bs, aiocb->aio_nbytes); + buf = qemu_try_blockalign(aiocb->bs, aiocb->aio_nbytes); + if (buf == NULL) { + return -ENOMEM; + } + if (aiocb->aio_type & QEMU_AIO_WRITE) { char *p = buf; int i; |