diff options
| author | Kevin Wolf | 2014-05-20 13:30:49 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2014-08-15 15:07:15 +0200 |
| commit | 4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78 (patch) | |
| tree | 6355b295adddcdf9ff43f2f019af4f60d47cc37c /block | |
| parent | dmg: Handle failure for potentially large allocations (diff) | |
| download | qemu-4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78.tar.gz qemu-4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78.tar.xz qemu-4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78.zip | |
iscsi: 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 iscsi block driver.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index a7bb6970ac..2c9cfc18eb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -893,7 +893,10 @@ coroutine_fn iscsi_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, nb_blocks = sector_qemu2lun(nb_sectors, iscsilun); if (iscsilun->zeroblock == NULL) { - iscsilun->zeroblock = g_malloc0(iscsilun->block_size); + iscsilun->zeroblock = g_try_malloc0(iscsilun->block_size); + if (iscsilun->zeroblock == NULL) { + return -ENOMEM; + } } iscsi_co_init_iscsitask(iscsilun, &iTask); |