33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From a2a7464e9f10a677d6f91e1c4fa527d084c22e7c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Fri, 24 Jul 2020 13:57:27 -0400
|
||
|
|
Subject: [PATCH] loader/linux: Avoid overflow on initrd size calculation
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||
|
|
---
|
||
|
|
grub-core/loader/linux.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
|
||
|
|
index 471b214d6..4cd8c20c7 100644
|
||
|
|
--- a/grub-core/loader/linux.c
|
||
|
|
+++ b/grub-core/loader/linux.c
|
||
|
|
@@ -151,8 +151,7 @@ grub_initrd_init (int argc, char *argv[],
|
||
|
|
initrd_ctx->nfiles = 0;
|
||
|
|
initrd_ctx->components = 0;
|
||
|
|
|
||
|
|
- initrd_ctx->components = grub_zalloc (argc
|
||
|
|
- * sizeof (initrd_ctx->components[0]));
|
||
|
|
+ initrd_ctx->components = grub_calloc (argc, sizeof (initrd_ctx->components[0]));
|
||
|
|
if (!initrd_ctx->components)
|
||
|
|
return grub_errno;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|