Skip to contentSkip to conversation

qcow2: Use g_try_realloc() in qcow2_expand_zero_clusters()

PATCH Applied Alberto Garcia 2 participants 2 messages Feb 9, 2018 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qcow2: Use g_try_realloc() in qcow2_expand_zero_clusters()

g_realloc() aborts the program if it fails to allocate the required amount of memory. We want to detect that scenario and return an error instead, so let's use g_try_realloc().

---
 block/qcow2-cluster.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
block/qcow2-cluster.c +9 -1
index a3fec27bf9..add6d86052 100644
@@ -2071,7 +2071,15 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs,
         int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size *
                                       sizeof(uint64_t), BDRV_SECTOR_SIZE);
 
-        l1_table = g_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE);
+        uint64_t *new_l1_table =
+            g_try_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE);
+
+        if (!new_l1_table) {
+            ret = -ENOMEM;
+            goto fail;
+        }
+
+        l1_table = new_l1_table;
 
         ret = bdrv_read(bs->file,
                         s->snapshots[i].l1_table_offset / BDRV_SECTOR_SIZE,
Signature · 1 line
2.11.0
Applied
#1 lore raw

Am 09.02.2018 um 15:42 hat Alberto Garcia geschrieben:

Quoted 5 lines

g_realloc() aborts the program if it fails to allocate the required amount of memory. We want to detect that scenario and return an error instead, so let's use g_try_realloc().

Thanks, applied to the block branch.

Kevin