1*4882a593SmuzhiyunFrom a2a7464e9f10a677d6f91e1c4fa527d084c22e7c Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Peter Jones <pjones@redhat.com>
3*4882a593SmuzhiyunDate: Fri, 24 Jul 2020 13:57:27 -0400
4*4882a593SmuzhiyunSubject: [PATCH] loader/linux: Avoid overflow on initrd size calculation
5*4882a593SmuzhiyunMIME-Version: 1.0
6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8
7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Peter Jones <pjones@redhat.com>
10*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
11*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
12*4882a593Smuzhiyun---
13*4882a593Smuzhiyun grub-core/loader/linux.c | 3 +--
14*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 2 deletions(-)
15*4882a593Smuzhiyun
16*4882a593Smuzhiyundiff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
17*4882a593Smuzhiyunindex 471b214d6..4cd8c20c7 100644
18*4882a593Smuzhiyun--- a/grub-core/loader/linux.c
19*4882a593Smuzhiyun+++ b/grub-core/loader/linux.c
20*4882a593Smuzhiyun@@ -151,8 +151,7 @@ grub_initrd_init (int argc, char *argv[],
21*4882a593Smuzhiyun   initrd_ctx->nfiles = 0;
22*4882a593Smuzhiyun   initrd_ctx->components = 0;
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun-  initrd_ctx->components = grub_zalloc (argc
25*4882a593Smuzhiyun-					* sizeof (initrd_ctx->components[0]));
26*4882a593Smuzhiyun+  initrd_ctx->components = grub_calloc (argc, sizeof (initrd_ctx->components[0]));
27*4882a593Smuzhiyun   if (!initrd_ctx->components)
28*4882a593Smuzhiyun     return grub_errno;
29*4882a593Smuzhiyun
30*4882a593Smuzhiyun--
31*4882a593Smuzhiyun2.26.2
32*4882a593Smuzhiyun
33