commit 4d5a3f888c7dbdd1bf892bab2a3fb5c1455ccc78
author Kevin Wolf <kwolf@redhat.com> Tue May 20 13:30:49 2014 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Aug 15 15:07:15 2014 +0200
tree 6355b295adddcdf9ff43f2f019af4f60d47cc37c
parent b546a944749f963c5b4e27765354df10ac531853

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>

block/iscsi.c

diff --git a/block/iscsi.c b/block/iscsi.c
index a7bb697..2c9cfc1 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -893,7 +893,10 @@
     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);