38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 12e20a6a695f4967b30a95bb52e4e2e0a10c9094 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Sun, 21 Aug 2022 22:22:35 +1000
|
|
Subject: [PATCH] disk/diskfilter: Check calloc() result for NULL
|
|
|
|
With wildly corrupt inputs, we can end up trying to calloc a very
|
|
large amount of memory, which will fail and give us a NULL pointer.
|
|
We need to check that to avoid a crash. (And, even if we blocked
|
|
such inputs, it is good practice to check the results of allocations
|
|
anyway.)
|
|
|
|
Reference:https://git.savannah.gnu.org/cgit/grub.git/commit?id=12e20a6a695f4967b30a95bb52e4e2e0a10c9094
|
|
Conflict:NA
|
|
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/disk/diskfilter.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
|
|
index 2edcff6e8..4ac50320e 100644
|
|
--- a/grub-core/disk/diskfilter.c
|
|
+++ b/grub-core/disk/diskfilter.c
|
|
@@ -1163,6 +1163,9 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
|
|
array->lvs->segments->raid_member_size = disk_size;
|
|
array->lvs->segments->nodes
|
|
= grub_calloc (nmemb, sizeof (array->lvs->segments->nodes[0]));
|
|
+ if (array->lvs->segments->nodes == NULL)
|
|
+ goto fail;
|
|
+
|
|
array->lvs->segments->stripe_size = stripe_size;
|
|
for (i = 0; i < nmemb; i++)
|
|
{
|
|
--
|
|
2.28.0.windows.1
|
|
|