Skip to contentSkip to conversation

grub: upgrade 2.04 -> 2.06~rc1

PATCH Naveen Saini 4 participants 4 messages Mar 30, 2021 1 message not in the archive Page 2 of 2

lore
Share & tools
lore
#4 lore raw
In reply to Khem Raj
Quoted 2 lines · Khem Raj

I would suggest to wait for final release perhaps.

Agreed, if all of the patches in 2.04 -> 2.06 are required CVE or bug fixes (i.e. no new features)

And of course assuming the final release doesn't exhibit the reboot loop that Zoltán encountered!

This is a tough one given the large number of patches required. I really don't want to carry hundreds of patches to 2.04 :-(

Steve

Quoted 5,022 lines
Quoted 5,017 lines · Naveen Saini

Hi all,

There are number of GRUB 2.04 CVEs in gatesgarth and dunfell which should be patched. So either it could be upgraded to 2.06-rc1 or backporting around 100+ CVEs patches.

I gave a quick try to backport 100+ patches, but observed that it needed to take all the patches from 2.04 to 2.06-rc1.

Please advise !

Regards,
Naveen

Quoted 5,001 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Naveen Saini
Sent: Friday, March 19, 2021 3:15 PM
To: [email protected]
Subject: [OE-core] [PATCH v4] grub: upgrade 2.04 -> 2.06~rc1

2.06 RC1 release have a number of CVEs fixed:
CVE-2020-15705
CVE-2021-3418
CVE-2020-27749
CVE-2021-20233
CVE-2021-20225
CVE-2020-25647
CVE-2020-25632
CVE-2020-27779
CVE-2020-14372
CVE-2020-15707
CVE-2020-15706
CVE-2020-14309
CVE-2020-14310
CVE-2020-14311
CVE-2020-14308
CVE-2020-10713
CVE-2014-4607

Dropped backported patches.

---
v2:
Using tar source from https://alpha.gnu.org/gnu/grub/
Set PV to "2.04+${2.06~rc1}"

v3:
Fixed commit message

v4:
Added UPSTREAM_CHECK_URI pointing to final release FTP location Added UPSTREAM_CHECK_REGEX too

---
 ...507ce30f775008e093580f0c9499dfb2c485.patch |   47 -
 .../grub/files/CVE-2020-10713.patch           |   73 -
 ...308-calloc-Use-calloc-at-most-places.patch | 1863 -----------------
 ...low-checking-primitives-where-we-do-.patch | 1330 ------------
 ...se-after-free-when-redefining-a-func.patch |  117 --
 ...er-overflows-in-initrd-size-handling.patch |  177 --
 .../grub/files/autogen.sh-exclude-pc.patch    |   15 +-
 ...-we-always-have-an-overflow-checking.patch |  246 ---
 meta/recipes-bsp/grub/files/determinism.patch |   58 +-
 ...dd-LVM-cache-logical-volume-handling.patch |  287 ---
 ...e-arithmetic-primitives-that-check-f.patch |   94 -
 ...used-fields-from-grub_script_functio.patch |   37 -
 .../{grub-efi_2.04.bb => grub-efi_git.bb}     |    2 -
 meta/recipes-bsp/grub/grub2.inc               |   24 +-
 .../grub/{grub_2.04.bb => grub_git.bb}        |    0
 15 files changed, 54 insertions(+), 4316 deletions(-)
 delete mode 100644 meta/recipes-
bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-10713.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-
Use-calloc-at-most-places.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-
2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-
where-we-do-.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15706-script-
Avoid-a-use-after-free-when-redefining-a-func.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-
integer-overflows-in-initrd-size-handling.patch
 delete mode 100644 meta/recipes-bsp/grub/files/calloc-Make-sure-we-
always-have-an-overflow-checking.patch
 delete mode 100644 meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-
logical-volume-handling.patch
 delete mode 100644 meta/recipes-bsp/grub/files/safemath-Add-some-
arithmetic-primitives-that-check-f.patch
 delete mode 100644 meta/recipes-bsp/grub/files/script-Remove-unused-
fields-from-grub_script_functio.patch
 rename meta/recipes-bsp/grub/{grub-efi_2.04.bb => grub-efi_git.bb} (98%)
 rename meta/recipes-bsp/grub/{grub_2.04.bb => grub_git.bb} (100%)
(quoted diff) +0 -0

bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch b/meta/recipes- bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch deleted file mode 100644
index 8aa2091444..0000000000
--- a/meta/recipes- bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch +++ /dev/null

(quoted diff) +0 -1
@@ -1,47 +0,0 @@
-From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00

2001

(quoted diff) +0 -5
-From: Simon Hardy <[email protected]>
-Date: Tue, 24 Mar 2020 13:29:12 +0000
-Subject: build: Fix GRUB i386-pc build with Ubuntu gcc
-
-With recent versions of gcc on Ubuntu a very large lzma_decompress.img

file is

(quoted diff) +0 -34
-output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to
-fail with: "error: Decompressor is too big."
-
-This seems to be caused by a section .note.gnu.property that is placed at an
-offset such that objcopy needs to pad the img file with zeros.
-
-This issue is present on:
-Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0
-Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008
-
-This issue is not present on:
-Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0
-RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4)
-
-The issue can be fixed by removing the section using objcopy as shown in
-this patch.
-
-Signed-off-by: Simon Hardy <[email protected]>
-Reviewed-by: Daniel Kiper <[email protected]>
----
- gentpl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Upstream-Status: Backport
-
-diff --git a/gentpl.py b/gentpl.py
-index 387588c05..c86550d4f 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -766,7 +766,7 @@ def image(defn, platform):
- if test x$(TARGET_APPLE_LINKER) = x1; then \
-   $(MACHO2IMG) $< $@; \
- else \
--  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-

unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \
-+ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip- unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
- fi
- """)

(quoted diff) +0 -4
-
---
-cgit v1.2.1
-
meta/recipes-bsp/grub/files/CVE-2020-10713.patch deleted +0 -46
deleted file mode 100644
index c507ed3ea8..0000000000
@@ -1,73 +0,0 @@
-From a4d3fbdff1e3ca8f87642af2ac8752c30c617a3e Mon Sep 17 00:00:00 2001
-From: Peter Jones <[email protected]>
-Date: Wed, 15 Apr 2020 15:45:02 -0400
-Subject: yylex: Make lexer fatal errors actually be fatal
-
-When presented with a command that can't be tokenized to anything
-smaller than YYLMAX characters, the parser calls YY_FATAL_ERROR(errmsg),
-expecting that will stop further processing, as such:
-
-  #define YY_DO_BEFORE_ACTION \
-        yyg->yytext_ptr = yy_bp; \
-        yyleng = (int) (yy_cp - yy_bp); \
-        yyg->yy_hold_char = *yy_cp; \
-        *yy_cp = '\0'; \
-        if ( yyleng >= YYLMAX ) \
-                YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-        yy_flex_strncpy( yytext, yyg->yytext_ptr, yyleng + 1 , yyscanner); \
-        yyg->yy_c_buf_p = yy_cp;
-
-The code flex generates expects that YY_FATAL_ERROR() will either return
-for it or do some form of longjmp(), or handle the error in some way at
-least, and so the strncpy() call isn't in an "else" clause, and thus if
-YY_FATAL_ERROR() is *not* actually fatal, it does the call with the
-questionable limit, and predictable results ensue.
-
-Unfortunately, our implementation of YY_FATAL_ERROR() is:
-
-   #define YY_FATAL_ERROR(msg)                     \
-     do {                                          \
-       grub_printf (_("fatal error: %s\n"), _(msg));     \
-     } while (0)
-
-The same pattern exists in yyless(), and similar problems exist in users
-of YY_INPUT(), several places in the main parsing loop,
-yy_get_next_buffer(), yy_load_buffer_state(), yyensure_buffer_stack,
-yy_scan_buffer(), etc.
-
-All of these callers expect YY_FATAL_ERROR() to actually be fatal, and
-the things they do if it returns after calling it are wildly unsafe.
-
-Fixes: CVE-2020-10713
-
-Signed-off-by: Peter Jones <[email protected]>
-Reviewed-by: Daniel Kiper <[email protected]>
-
-Upstream-Status: Backport

[https://git.savannah.gnu.org/cgit/grub.git/commit/?id=a4d3fbdff1e3ca8f87
642af2ac8752c30c617a3e]

meta/recipes-bsp/grub/files/CVE-2020-10713.patch deleted +0 -27
-CVE: CVE-2020-10713
-Signed-off-by: Chee Yang Lee <[email protected]>
----
- grub-core/script/yylex.l | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 7b44c37b7..b7203c823 100644
---- a/grub-core/script/yylex.l
-+++ b/grub-core/script/yylex.l
-@@ -37,11 +37,11 @@
-
- /*
-  * As we don't have access to yyscanner, we cannot do much except to
-- * print the fatal error.
-+ * print the fatal error and exit.
-  */
- #define YY_FATAL_ERROR(msg)                     \
-   do {                                          \
--    grub_printf (_("fatal error: %s\n"), _(msg));     \
-+    grub_fatal (_("fatal error: %s\n"), _(msg));\
-   } while (0)
-
- #define COPY(str, hint)                         \
---
-cgit v1.2.1
-
(quoted diff) +0 -0

most-places.patch b/meta/recipes-bsp/grub/files/CVE-2020-14308-calloc- Use-calloc-at-most-places.patch
deleted file mode 100644
index 637e368cb0..0000000000
--- a/meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-Use-calloc-at- most-places.patch
+++ /dev/null

(quoted diff) +0 -1
@@ -1,1863 +0,0 @@
-From bcdd6a55952222ec9829a59348240a4f983b0b56 Mon Sep 17 00:00:00

2001

(quoted diff) +0 -28
-From: Peter Jones <[email protected]>
-Date: Mon, 15 Jun 2020 12:26:01 -0400
-Subject: [PATCH 4/9] calloc: Use calloc() at most places
-
-This modifies most of the places we do some form of:
-
-  X = malloc(Y * Z);
-
-to use calloc(Y, Z) instead.
-
-Among other issues, this fixes:
-  - allocation of integer overflow in grub_png_decode_image_header()
-    reported by Chris Coulson,
-  - allocation of integer overflow in luks_recover_key()
-    reported by Chris Coulson,
-  - allocation of integer overflow in grub_lvm_detect()
-    reported by Chris Coulson.
-
-Fixes: CVE-2020-14308
-
-Signed-off-by: Peter Jones <[email protected]>
-Reviewed-by: Daniel Kiper <[email protected]>
-
-Upstream-Status: Backport
-CVE: CVE-2020-14308
-
-Reference to upstream patch:
-

https://git.savannah.gnu.org/cgit/grub.git/commit/?id=f725fa7cb2ece547c5a
f01eeeecfe8d95802ed41
-
-[YL: don't patch on grub-core/lib/json/json.c, which is not existing in grub 2.04]

(quoted diff) +0 -106
-Signed-off-by: Yongxin Liu <[email protected]>
----
- grub-core/bus/usb/usbhub.c                |  8 ++++----
- grub-core/commands/efi/lsefisystab.c      |  3 ++-
- grub-core/commands/legacycfg.c            |  6 +++---
- grub-core/commands/menuentry.c            |  2 +-
- grub-core/commands/nativedisk.c           |  2 +-
- grub-core/commands/parttool.c             | 12 +++++++++---
- grub-core/commands/regexp.c               |  2 +-
- grub-core/commands/search_wrap.c          |  2 +-
- grub-core/disk/diskfilter.c               |  4 ++--
- grub-core/disk/ieee1275/ofdisk.c          |  2 +-
- grub-core/disk/ldm.c                      | 14 +++++++-------
- grub-core/disk/luks.c                     |  2 +-
- grub-core/disk/lvm.c                      | 12 ++++++------
- grub-core/disk/xen/xendisk.c              |  2 +-
- grub-core/efiemu/loadcore.c               |  2 +-
- grub-core/efiemu/mm.c                     |  6 +++---
- grub-core/font/font.c                     |  3 +--
- grub-core/fs/affs.c                       |  6 +++---
- grub-core/fs/btrfs.c                      |  6 +++---
- grub-core/fs/hfs.c                        |  2 +-
- grub-core/fs/hfsplus.c                    |  6 +++---
- grub-core/fs/iso9660.c                    |  2 +-
- grub-core/fs/ntfs.c                       |  4 ++--
- grub-core/fs/sfs.c                        |  2 +-
- grub-core/fs/tar.c                        |  2 +-
- grub-core/fs/udf.c                        |  4 ++--
- grub-core/fs/zfs/zfs.c                    |  4 ++--
- grub-core/gfxmenu/gui_string_util.c       |  2 +-
- grub-core/gfxmenu/widget-box.c            |  4 ++--
- grub-core/io/gzio.c                       |  2 +-
- grub-core/kern/efi/efi.c                  |  6 +++---
- grub-core/kern/emu/hostdisk.c             |  2 +-
- grub-core/kern/fs.c                       |  2 +-
- grub-core/kern/misc.c                     |  2 +-
- grub-core/kern/parser.c                   |  2 +-
- grub-core/kern/uboot/uboot.c              |  2 +-
- grub-core/lib/libgcrypt/cipher/ac.c       |  8 ++++----
- grub-core/lib/libgcrypt/cipher/primegen.c |  4 ++--
- grub-core/lib/libgcrypt/cipher/pubkey.c   |  4 ++--
- grub-core/lib/priority_queue.c            |  2 +-
- grub-core/lib/reed_solomon.c              |  7 +++----
- grub-core/lib/relocator.c                 | 10 +++++-----
- grub-core/lib/zstd/fse_decompress.c       |  2 +-
- grub-core/loader/arm/linux.c              |  2 +-
- grub-core/loader/efi/chainloader.c        |  2 +-
- grub-core/loader/i386/bsdXX.c             |  2 +-
- grub-core/loader/i386/xnu.c               |  4 ++--
- grub-core/loader/macho.c                  |  2 +-
- grub-core/loader/multiboot_elfxx.c        |  2 +-
- grub-core/loader/xnu.c                    |  2 +-
- grub-core/mmap/mmap.c                     |  4 ++--
- grub-core/net/bootp.c                     |  2 +-
- grub-core/net/dns.c                       | 10 +++++-----
- grub-core/net/net.c                       |  4 ++--
- grub-core/normal/charset.c                | 10 +++++-----
- grub-core/normal/cmdline.c                | 14 +++++++-------
- grub-core/normal/menu_entry.c             | 14 +++++++-------
- grub-core/normal/menu_text.c              |  4 ++--
- grub-core/normal/term.c                   |  4 ++--
- grub-core/osdep/linux/getroot.c           |  6 +++---
- grub-core/osdep/unix/config.c             |  2 +-
- grub-core/osdep/windows/getroot.c         |  2 +-
- grub-core/osdep/windows/hostdisk.c        |  4 ++--
- grub-core/osdep/windows/init.c            |  2 +-
- grub-core/osdep/windows/platform.c        |  4 ++--
- grub-core/osdep/windows/relpath.c         |  2 +-
- grub-core/partmap/gpt.c                   |  2 +-
- grub-core/partmap/msdos.c                 |  2 +-
- grub-core/script/execute.c                |  2 +-
- grub-core/tests/fake_input.c              |  2 +-
- grub-core/tests/video_checksum.c          |  6 +++---
- grub-core/video/capture.c                 |  2 +-
- grub-core/video/emu/sdl.c                 |  2 +-
- grub-core/video/i386/pc/vga.c             |  2 +-
- grub-core/video/readers/png.c             |  2 +-
- include/grub/unicode.h                    |  4 ++--
- util/getroot.c                            |  2 +-
- util/grub-file.c                          |  2 +-
- util/grub-fstest.c                        |  4 ++--
- util/grub-install-common.c                |  2 +-
- util/grub-install.c                       |  4 ++--
- util/grub-mkimagexx.c                     |  6 ++----
- util/grub-mkrescue.c                      |  4 ++--
- util/grub-mkstandalone.c                  |  2 +-
- util/grub-pe2elf.c                        | 12 +++++-------
- util/grub-probe.c                         |  4 ++--
- 86 files changed, 178 insertions(+), 177 deletions(-)
-
-diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
-index 34a7ff1..a06cce3 100644
---- a/grub-core/bus/usb/usbhub.c
-+++ b/grub-core/bus/usb/usbhub.c
-@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
-   grub_usb_set_configuration (dev, 1);
-
-   dev->nports = hubdesc.portcnt;
--  dev->children = grub_zalloc (hubdesc.portcnt * sizeof (dev->children[0]));
--  dev->ports = grub_zalloc (dev->nports * sizeof (dev->ports[0]));
-+  dev->children = grub_calloc (hubdesc.portcnt, sizeof (dev->children[0]));
-+  dev->ports = grub_calloc (dev->nports, sizeof (dev->ports[0]));
-   if (!dev->children || !dev->ports)
-     {
-       grub_free (dev->children);
-@@ -268,8 +268,8 @@ grub_usb_controller_dev_register_iter

(grub_usb_controller_t controller, void *d

(quoted diff) +0 -11
-
-   /* Query the number of ports the root Hub has.  */
-   hub->nports = controller->dev->hubports (controller);
--  hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports);
--  hub->ports = grub_zalloc (sizeof (hub->ports[0]) * hub->nports);
-+  hub->devices = grub_calloc (hub->nports, sizeof (hub->devices[0]));
-+  hub->ports = grub_calloc (hub->nports, sizeof (hub->ports[0]));
-   if (!hub->devices || !hub->ports)
-     {
-       grub_free (hub->devices);
-diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-

core/commands/efi/lsefisystab.c
-index df10302..cd81507 100644
---- a/grub-core/commands/efi/lsefisystab.c
-+++ b/grub-core/commands/efi/lsefisystab.c
-@@ -71,7 +71,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),

(quoted diff) +0 -3
-     grub_printf ("Vendor: ");
-
-     for (vendor_utf16 = st->firmware_vendor; *vendor_utf16;

vendor_utf16++);

--    vendor = grub_malloc (4 * (vendor_utf16 - st->firmware_vendor) + 1);
-+    /* Allocate extra 3 bytes to simplify math. */
-+    vendor = grub_calloc (4, vendor_utf16 - st->firmware_vendor + 1);
(quoted diff) +0 -4
-     if (!vendor)
-       return grub_errno;
-     *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
-diff --git a/grub-core/commands/legacycfg.c b/grub-

core/commands/legacycfg.c
-index db7a8f0..5e3ec0d 100644
---- a/grub-core/commands/legacycfg.c
-+++ b/grub-core/commands/legacycfg.c
-@@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),

(quoted diff) +0 -2
-   if (argc < 2)
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename

expected"));

(quoted diff) +0 -7
-
--  cutargs = grub_malloc (sizeof (cutargs[0]) * (argc - 1));
-+  cutargs = grub_calloc (argc - 1, sizeof (cutargs[0]));
-   if (!cutargs)
-     return grub_errno;
-   cutargc = argc - 1;
-@@ -436,7 +436,7 @@ grub_cmd_legacy_kernel (struct grub_command

*mycmd __attribute__ ((unused)),

(quoted diff) +0 -9
-         {
-           char rbuf[3] = "-r";
-           bsdargc = cutargc + 2;
--          bsdargs = grub_malloc (sizeof (bsdargs[0]) * bsdargc);
-+          bsdargs = grub_calloc (bsdargc, sizeof (bsdargs[0]));
-           if (!bsdargs)
-             {
-               err = grub_errno;
-@@ -559,7 +559,7 @@ grub_cmd_legacy_initrdnounzip (struct

grub_command *mycmd __attribute__ ((unused
- return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find
command `%s'"),

(quoted diff) +0 -8
-                        "module");
-
--      newargs = grub_malloc ((argc + 1) * sizeof (newargs[0]));
-+      newargs = grub_calloc (argc + 1, sizeof (newargs[0]));
-       if (!newargs)
-     return grub_errno;
-       grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));
-diff --git a/grub-core/commands/menuentry.c b/grub-

core/commands/menuentry.c
-index 2c5363d..9164df7 100644
---- a/grub-core/commands/menuentry.c
-+++ b/grub-core/commands/menuentry.c
-@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,

(quoted diff) +0 -9
-     goto fail;
-
-   /* Save argc, args to pass as parameters to block arg later. */
--  menu_args = grub_malloc (sizeof (char*) * (argc + 1));
-+  menu_args = grub_calloc (argc + 1, sizeof (char *));
-   if (! menu_args)
-     goto fail;
-
-diff --git a/grub-core/commands/nativedisk.c b/grub-

core/commands/nativedisk.c
-index 699447d..7c8f97f 100644
---- a/grub-core/commands/nativedisk.c
-+++ b/grub-core/commands/nativedisk.c
-@@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),

(quoted diff) +0 -9
-   else
-     path_prefix = prefix;
-
--  mods = grub_malloc (argc * sizeof (mods[0]));
-+  mods = grub_calloc (argc, sizeof (mods[0]));
-   if (!mods)
-     return grub_errno;
-
-diff --git a/grub-core/commands/parttool.c b/grub-

core/commands/parttool.c

(quoted diff) +0 -19
-index 22b46b1..051e313 100644
---- a/grub-core/commands/parttool.c
-+++ b/grub-core/commands/parttool.c
-@@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name,
-   for (nargs = 0; args[nargs].name != 0; nargs++);
-   cur->nargs = nargs;
-   cur->args = (struct grub_parttool_argdesc *)
--    grub_malloc ((nargs + 1) * sizeof (struct grub_parttool_argdesc));
-+    grub_calloc (nargs + 1, sizeof (struct grub_parttool_argdesc));
-+  if (!cur->args)
-+    {
-+      grub_free (cur);
-+      curhandle--;
-+      return -1;
-+    }
-   grub_memcpy (cur->args, args,
-            (nargs + 1) * sizeof (struct grub_parttool_argdesc));
-
-@@ -257,7 +263,7 @@ grub_cmd_parttool (grub_command_t cmd

__attribute__ ((unused)),

(quoted diff) +0 -9
-     return err;
-       }
-
--  parsed = (int *) grub_zalloc (argc * sizeof (int));
-+  parsed = (int *) grub_calloc (argc, sizeof (int));
-
-   for (i = 1; i < argc; i++)
-     if (! parsed[i])
-@@ -290,7 +296,7 @@ grub_cmd_parttool (grub_command_t cmd

__attribute__ ((unused)),

(quoted diff) +0 -9
-       }
-     ptool = cur;
-     pargs = (struct grub_parttool_args *)
--      grub_zalloc (ptool->nargs * sizeof (struct grub_parttool_args));
-+      grub_calloc (ptool->nargs, sizeof (struct grub_parttool_args));
-     for (j = i; j < argc; j++)
-       if (! parsed[j])
-         {
-diff --git a/grub-core/commands/regexp.c b/grub-

core/commands/regexp.c
-index f00b184..4019164 100644
---- a/grub-core/commands/regexp.c
-+++ b/grub-core/commands/regexp.c
-@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)

(quoted diff) +0 -9
-   if (ret)
-     goto fail;
-
--  matches = grub_zalloc (sizeof (*matches) * (regex.re_nsub + 1));
-+  matches = grub_calloc (regex.re_nsub + 1, sizeof (*matches));
-   if (! matches)
-     goto fail;
-
-diff --git a/grub-core/commands/search_wrap.c b/grub-

core/commands/search_wrap.c
-index d7fd26b..47fc8eb 100644
---- a/grub-core/commands/search_wrap.c
-+++ b/grub-core/commands/search_wrap.c
-@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)

(quoted diff) +0 -13
-     for (i = 0; state[SEARCH_HINT_BAREMETAL].args[i]; i++)
-       nhints++;
-
--  hints = grub_malloc (sizeof (hints[0]) * nhints);
-+  hints = grub_calloc (nhints, sizeof (hints[0]));
-   if (!hints)
-     return grub_errno;
-   j = 0;
-diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
-index c3b578a..68ca9e0 100644
---- a/grub-core/disk/diskfilter.c
-+++ b/grub-core/disk/diskfilter.c
-@@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen,

char *uuid, int nmemb,

(quoted diff) +0 -9
-   array->lvs->segments->node_count = nmemb;
-   array->lvs->segments->raid_member_size = disk_size;
-   array->lvs->segments->nodes
--    = grub_zalloc (nmemb * sizeof (array->lvs->segments->nodes[0]));
-+    = grub_calloc (nmemb, sizeof (array->lvs->segments->nodes[0]));
-   array->lvs->segments->stripe_size = stripe_size;
-   for (i = 0; i < nmemb; i++)
-     {
-@@ -1226,7 +1226,7 @@ insert_array (grub_disk_t disk, const struct

grub_diskfilter_pv_id *id,

(quoted diff) +0 -9
-       grub_partition_t p;
-       for (p = disk->partition; p; p = p->parent)
-         s++;
--      pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0]));
-+      pv->partmaps = xcalloc (s, sizeof (pv->partmaps[0]));
-       s = 0;
-       for (p = disk->partition; p; p = p->parent)
-         pv->partmaps[s++] = xstrdup (p->partmap->name);
-diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-

core/disk/ieee1275/ofdisk.c
-index f73257e..03674cb 100644
---- a/grub-core/disk/ieee1275/ofdisk.c
-+++ b/grub-core/disk/ieee1275/ofdisk.c
-@@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)

(quoted diff) +0 -39
-       /* Power machines documentation specify 672 as maximum SAS disks in
-          one system. Using a slightly larger value to be safe. */
-       table_size = 768;
--      table = grub_malloc (table_size * sizeof (grub_uint64_t));
-+      table = grub_calloc (table_size, sizeof (grub_uint64_t));
-
-       if (!table)
-         {
-diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 2a22d2d..e632370 100644
---- a/grub-core/disk/ldm.c
-+++ b/grub-core/disk/ldm.c
-@@ -323,8 +323,8 @@ make_vg (grub_disk_t disk,
-       lv->segments->type = GRUB_DISKFILTER_MIRROR;
-       lv->segments->node_count = 0;
-       lv->segments->node_alloc = 8;
--      lv->segments->nodes = grub_zalloc (sizeof (*lv->segments->nodes)
--                                         * lv->segments->node_alloc);
-+      lv->segments->nodes = grub_calloc (lv->segments->node_alloc,
-+                                         sizeof (*lv->segments->nodes));
-       if (!lv->segments->nodes)
-         goto fail2;
-       ptr = vblk[i].dynamic;
-@@ -543,8 +543,8 @@ make_vg (grub_disk_t disk,
-         {
-           comp->segment_alloc = 8;
-           comp->segment_count = 0;
--          comp->segments = grub_malloc (sizeof (*comp->segments)
--                                        * comp->segment_alloc);
-+          comp->segments = grub_calloc (comp->segment_alloc,
-+                                        sizeof (*comp->segments));
-           if (!comp->segments)
-             goto fail2;
-         }
-@@ -590,8 +590,8 @@ make_vg (grub_disk_t disk,
-             }
-           comp->segments->node_count = read_int (ptr + 1, *ptr);
-           comp->segments->node_alloc = comp->segments->node_count;
--          comp->segments->nodes = grub_zalloc (sizeof (*comp-
Quoted 1 line

segments->nodes)

-- * comp->segments-

Quoted 1 line

node_alloc);

-+ comp->segments->nodes = grub_calloc (comp->segments-

Quoted 1 line

node_alloc,

-+ sizeof (*comp->segments-

Quoted 1 line

nodes));

(quoted diff) +0 -4
-           if (!lv->segments->nodes)
-             goto fail2;
-         }
-@@ -1017,7 +1017,7 @@ grub_util_ldm_embed (struct grub_disk *disk,

unsigned int *nsectors,

(quoted diff) +0 -46
-       *nsectors = lv->size;
-       if (*nsectors > max_nsectors)
-     *nsectors = max_nsectors;
--      *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-+      *sectors = grub_calloc (*nsectors, sizeof (**sectors));
-       if (!*sectors)
-     return grub_errno;
-       for (i = 0; i < *nsectors; i++)
-diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
-index 86c50c6..18b3a8b 100644
---- a/grub-core/disk/luks.c
-+++ b/grub-core/disk/luks.c
-@@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source,
-     && grub_be_to_cpu32 (header.keyblock[i].stripes) > max_stripes)
-       max_stripes = grub_be_to_cpu32 (header.keyblock[i].stripes);
-
--  split_key = grub_malloc (keysize * max_stripes);
-+  split_key = grub_calloc (keysize, max_stripes);
-   if (!split_key)
-     return grub_errno;
-
-diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index dc6b83b..7b5fbbc 100644
---- a/grub-core/disk/lvm.c
-+++ b/grub-core/disk/lvm.c
-@@ -209,7 +209,7 @@ grub_lvm_detect (grub_disk_t disk,
-      first one.  */
-
-   /* Allocate buffer space for the circular worst-case scenario. */
--  metadatabuf = grub_malloc (2 * mda_size);
-+  metadatabuf = grub_calloc (2, mda_size);
-   if (! metadatabuf)
-     goto fail;
-
-@@ -464,7 +464,7 @@ grub_lvm_detect (grub_disk_t disk,
- #endif
-               goto lvs_fail;
-             }
--          lv->segments = grub_zalloc (sizeof (*seg) * lv->segment_count);
-+          lv->segments = grub_calloc (lv->segment_count, sizeof (*seg));
-           seg = lv->segments;
-
-           for (i = 0; i < lv->segment_count; i++)
-@@ -521,8 +521,8 @@ grub_lvm_detect (grub_disk_t disk,
-                   if (seg->node_count != 1)
-                     seg->stripe_size = grub_lvm_getvalue (&p,

"stripe_size = ");

(quoted diff) +0 -13
-
--                  seg->nodes = grub_zalloc (sizeof (*stripe)
--                                            * seg->node_count);
-+                  seg->nodes = grub_calloc (seg->node_count,
-+                                            sizeof (*stripe));
-                   stripe = seg->nodes;
-
-                   p = grub_strstr (p, "stripes = [");
-@@ -898,7 +898,7 @@ grub_lvm_detect (grub_disk_t disk,
-             break;
-         if (lv)
-           {
--            cache->lv->segments = grub_malloc (lv->segment_count *

sizeof (*lv->segments));
-+ cache->lv->segments = grub_calloc (lv->segment_count,
sizeof (*lv->segments));

(quoted diff) +0 -5
-             if (!cache->lv->segments)
-               {
-                 grub_lvm_free_cache_lvs (cache_lvs);
-@@ -911,7 +911,7 @@ grub_lvm_detect (grub_disk_t disk,
-                 struct grub_diskfilter_node *nodes = lv-
Quoted 1 line

segments[i].nodes;

(quoted diff) +0 -3
-                 grub_size_t node_count = lv->segments[i].node_count;
-
--                cache->lv->segments[i].nodes = grub_malloc (node_count

* sizeof (*nodes));
-+ cache->lv->segments[i].nodes = grub_calloc (node_count,
sizeof (*nodes));

(quoted diff) +0 -23
-                 if (!cache->lv->segments[i].nodes)
-                   {
-                     for (j = 0; j < i; ++j)
-diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c
-index 48476cb..d6612ee 100644
---- a/grub-core/disk/xen/xendisk.c
-+++ b/grub-core/disk/xen/xendisk.c
-@@ -426,7 +426,7 @@ grub_xendisk_init (void)
-   if (!ctr)
-     return;
-
--  virtdisks = grub_malloc (ctr * sizeof (virtdisks[0]));
-+  virtdisks = grub_calloc (ctr, sizeof (virtdisks[0]));
-   if (!virtdisks)
-     return;
-   if (grub_xenstore_dir ("device/vbd", fill, &ctr))
-diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c
-index 44085ef..2b92462 100644
---- a/grub-core/efiemu/loadcore.c
-+++ b/grub-core/efiemu/loadcore.c
-@@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e)
-
-   grub_efiemu_nelfsyms = (unsigned) s->sh_size / (unsigned) s-
Quoted 1 line

sh_entsize;

- grub_efiemu_elfsyms = (struct grub_efiemu_elf_sym *)
-- grub_malloc (sizeof (struct grub_efiemu_elf_sym) *
grub_efiemu_nelfsyms);
-+ grub_calloc (grub_efiemu_nelfsyms, sizeof (struct
grub_efiemu_elf_sym));

(quoted diff) +0 -12
-
-   /* Relocators */
-   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
-diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 52a032f..9b8e0d0 100644
---- a/grub-core/efiemu/mm.c
-+++ b/grub-core/efiemu/mm.c
-@@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void)
-   /* Initialize variables*/
-   grub_memset (present, 0, sizeof (int) * GRUB_EFI_MAX_MEMORY_TYPE);
-   scanline_events = (struct grub_efiemu_mmap_scan *)
--    grub_malloc (sizeof (struct grub_efiemu_mmap_scan) * 2 *

mmap_num);
-+ grub_calloc (mmap_num, sizeof (struct grub_efiemu_mmap_scan) * 2);

(quoted diff) +0 -13
-
-   /* Number of chunks can't increase more than by factor of 2 */
-   result = (grub_efi_memory_descriptor_t *)
--    grub_malloc (sizeof (grub_efi_memory_descriptor_t) * 2 * mmap_num);
-+    grub_calloc (mmap_num, sizeof (grub_efi_memory_descriptor_t) * 2);
-   if (!result || !scanline_events)
-     {
-       grub_free (result);
-@@ -660,7 +660,7 @@ grub_efiemu_mm_do_alloc (void)
-
-   /* Preallocate mmap */
-   efiemu_mmap = (grub_efi_memory_descriptor_t *)
--    grub_malloc (mmap_reserved_size * sizeof

(grub_efi_memory_descriptor_t));
-+ grub_calloc (mmap_reserved_size, sizeof
(grub_efi_memory_descriptor_t));

(quoted diff) +0 -8
-   if (!efiemu_mmap)
-     {
-       grub_efiemu_unload ();
-diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 85a2925..8e118b3 100644
---- a/grub-core/font/font.c
-+++ b/grub-core/font/font.c
-@@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t

sect_length, struct

(quoted diff) +0 -6
-   font->num_chars = sect_length / FONT_CHAR_INDEX_ENTRY_SIZE;
-
-   /* Allocate the character index array.  */
--  font->char_index = grub_malloc (font->num_chars
--                              * sizeof (struct char_index_entry));
-+  font->char_index = grub_calloc (font->num_chars, sizeof (struct

char_index_entry));

(quoted diff) +0 -57
-   if (!font->char_index)
-     return 1;
-   font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
-diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
-index 6b6a2bc..220b371 100644
---- a/grub-core/fs/affs.c
-+++ b/grub-core/fs/affs.c
-@@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node)
-       return 0;
-     }
-   latin1[symlink_size] = 0;
--  utf8 = grub_malloc (symlink_size * GRUB_MAX_UTF8_PER_LATIN1 + 1);
-+  utf8 = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, symlink_size);
-   if (!utf8)
-     {
-       grub_free (latin1);
-@@ -422,7 +422,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
-     return 1;
-     }
-
--  hashtable = grub_zalloc (data->htsize * sizeof (*hashtable));
-+  hashtable = grub_calloc (data->htsize, sizeof (*hashtable));
-   if (!hashtable)
-     return 1;
-
-@@ -628,7 +628,7 @@ grub_affs_label (grub_device_t device, char **label)
-       len = file.namelen;
-       if (len > sizeof (file.name))
-     len = sizeof (file.name);
--      *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1);
-+      *label = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, len);
-       if (*label)
-     *grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';
-     }
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 48bd3d0..11272ef 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data,
-     {
-       desc->allocated = 16;
-       desc->depth = 0;
--      desc->data = grub_malloc (sizeof (desc->data[0]) * desc->allocated);
-+      desc->data = grub_calloc (desc->allocated, sizeof (desc->data[0]));
-       if (!desc->data)
-     return grub_errno;
-     }
-@@ -752,7 +752,7 @@ raid56_read_retry (struct grub_btrfs_data *data,
-   grub_err_t ret = GRUB_ERR_OUT_OF_MEMORY;
-   grub_uint64_t i, failed_devices;
-
--  buffers = grub_zalloc (sizeof(*buffers) * nstripes);
-+  buffers = grub_calloc (nstripes, sizeof (*buffers));
-   if (!buffers)
-     goto cleanup;
-
-@@ -2160,7 +2160,7 @@ grub_btrfs_embed (grub_device_t device

__attribute__ ((unused)),

(quoted diff) +0 -13
-   *nsectors = 64 * 2 - 1;
-   if (*nsectors > max_nsectors)
-     *nsectors = max_nsectors;
--  *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-+  *sectors = grub_calloc (*nsectors, sizeof (**sectors));
-   if (!*sectors)
-     return grub_errno;
-   for (i = 0; i < *nsectors; i++)
-diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
-index ac0a409..3fe842b 100644
---- a/grub-core/fs/hfs.c
-+++ b/grub-core/fs/hfs.c
-@@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char

**label)

(quoted diff) +0 -17
-       grub_size_t len = data->sblock.volname[0];
-       if (len > sizeof (data->sblock.volname) - 1)
-     len = sizeof (data->sblock.volname) - 1;
--      *label = grub_malloc (len * MAX_UTF8_PER_MAC_ROMAN + 1);
-+      *label = grub_calloc (MAX_UTF8_PER_MAC_ROMAN + 1, len);
-       if (*label)
-     macroman_to_utf8 (*label, data->sblock.volname + 1,
-                       len + 1, 0);
-diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 54786bb..dae43be 100644
---- a/grub-core/fs/hfsplus.c
-+++ b/grub-core/fs/hfsplus.c
-@@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg)
-   if (! filename)
-     return 0;
-
--  keyname = grub_malloc (grub_be_to_cpu16 (catkey->namelen) * sizeof

(*keyname));
-+ keyname = grub_calloc (grub_be_to_cpu16 (catkey->namelen), sizeof (*keyname));

(quoted diff) +0 -4
-   if (!keyname)
-     {
-       grub_free (filename);
-@@ -1007,7 +1007,7 @@ grub_hfsplus_label (grub_device_t device, char

**label)

(quoted diff) +0 -9
-     grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr);
-
-   label_len = grub_be_to_cpu16 (catkey->namelen);
--  label_name = grub_malloc (label_len * sizeof (*label_name));
-+  label_name = grub_calloc (label_len, sizeof (*label_name));
-   if (!label_name)
-     {
-       grub_free (node);
-@@ -1029,7 +1029,7 @@ grub_hfsplus_label (grub_device_t device, char

**label)

(quoted diff) +0 -13
-     }
-     }
-
--  *label = grub_malloc (label_len * GRUB_MAX_UTF8_PER_UTF16 + 1);
-+  *label = grub_calloc (label_len, GRUB_MAX_UTF8_PER_UTF16 + 1);
-   if (! *label)
-     {
-       grub_free (label_name);
-diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 49c0c63..4f1b52a 100644
---- a/grub-core/fs/iso9660.c
-+++ b/grub-core/fs/iso9660.c
-@@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int

len)

(quoted diff) +0 -28
-   int i;
-   grub_uint16_t t[MAX_NAMELEN / 2 + 1];
-
--  p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1);
-+  p = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1);
-   if (! p)
-     return NULL;
-
-diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
-index fc4e1f6..2f34f76 100644
---- a/grub-core/fs/ntfs.c
-+++ b/grub-core/fs/ntfs.c
-@@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len)
-   grub_uint16_t *tmp;
-   grub_size_t i;
-
--  buf = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1);
--  tmp = grub_malloc (len * sizeof (tmp[0]));
-+  buf = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1);
-+  tmp = grub_calloc (len, sizeof (tmp[0]));
-   if (!buf || !tmp)
-     {
-       grub_free (buf);
-diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 50c1fe7..90f7fb3 100644
---- a/grub-core/fs/sfs.c
-+++ b/grub-core/fs/sfs.c
-@@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node,

grub_disk_addr_t fileblock)

(quoted diff) +0 -13
-       node->next_extent = node->block;
-       node->cache_size = 0;
-
--      node->cache = grub_malloc (sizeof (node->cache[0]) * cache_size);
-+      node->cache = grub_calloc (cache_size, sizeof (node->cache[0]));
-       if (!node->cache)
-     {
-       grub_errno = 0;
-diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
-index 7d63e0c..c551ed6 100644
---- a/grub-core/fs/tar.c
-+++ b/grub-core/fs/tar.c
-@@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data,

char **name,

(quoted diff) +0 -13
-       if (data->linkname_alloc < linksize + 1)
-         {
-           char *n;
--          n = grub_malloc (2 * (linksize + 1));
-+          n = grub_calloc (2, linksize + 1);
-           if (!n)
-             return grub_errno;
-           grub_free (data->linkname);
-diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index dc8b6e2..a837616 100644
---- a/grub-core/fs/udf.c
-+++ b/grub-core/fs/udf.c
-@@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t

sz, char *outbuf)

(quoted diff) +0 -9
-     {
-       unsigned i;
-       utf16len = sz - 1;
--      utf16 = grub_malloc (utf16len * sizeof (utf16[0]));
-+      utf16 = grub_calloc (utf16len, sizeof (utf16[0]));
-       if (!utf16)
-     return NULL;
-       for (i = 0; i < utf16len; i++)
-@@ -883,7 +883,7 @@ read_string (const grub_uint8_t *raw, grub_size_t

sz, char *outbuf)

(quoted diff) +0 -13
-     {
-       unsigned i;
-       utf16len = (sz - 1) / 2;
--      utf16 = grub_malloc (utf16len * sizeof (utf16[0]));
-+      utf16 = grub_calloc (utf16len, sizeof (utf16[0]));
-       if (!utf16)
-     return NULL;
-       for (i = 0; i < utf16len; i++)
-diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 2f72e42..381dde5 100644
---- a/grub-core/fs/zfs/zfs.c
-+++ b/grub-core/fs/zfs/zfs.c
-@@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct

subvolume *subvol,

(quoted diff) +0 -4
-     }
-       subvol->nkeys = 0;
-       zap_iterate (&keychain_dn, 8, count_zap_keys, &ctx, data);
--      subvol->keyring = grub_zalloc (subvol->nkeys * sizeof (subvol-
Quoted 1 line

keyring[0]));

-+ subvol->keyring = grub_calloc (subvol->nkeys, sizeof (subvol-

Quoted 1 line

keyring[0]));

(quoted diff) +0 -4
-       if (!subvol->keyring)
-     {
-       grub_free (fsname);
-@@ -4336,7 +4336,7 @@ grub_zfs_embed (grub_device_t device

__attribute__ ((unused)),

(quoted diff) +0 -9
-   *nsectors = (VDEV_BOOT_SIZE >> GRUB_DISK_SECTOR_BITS);
-   if (*nsectors > max_nsectors)
-     *nsectors = max_nsectors;
--  *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-+  *sectors = grub_calloc (*nsectors, sizeof (**sectors));
-   if (!*sectors)
-     return grub_errno;
-   for (i = 0; i < *nsectors; i++)
-diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-

core/gfxmenu/gui_string_util.c

(quoted diff) +0 -13
-index a9a415e..ba1e1ea 100644
---- a/grub-core/gfxmenu/gui_string_util.c
-+++ b/grub-core/gfxmenu/gui_string_util.c
-@@ -55,7 +55,7 @@ canonicalize_path (const char *path)
-     if (*p == '/')
-       components++;
-
--  char **path_array = grub_malloc (components * sizeof (*path_array));
-+  char **path_array = grub_calloc (components, sizeof (*path_array));
-   if (! path_array)
-     return 0;
-
-diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-

box.c
-index b606028..470597d 100644
---- a/grub-core/gfxmenu/widget-box.c
-+++ b/grub-core/gfxmenu/widget-box.c
-@@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,

(quoted diff) +0 -4
-   box->content_height = 0;
-   box->raw_pixmaps =
-     (struct grub_video_bitmap **)
--    grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap

*));
-+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *));

(quoted diff) +0 -3
-   box->scaled_pixmaps =
-     (struct grub_video_bitmap **)
--    grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap

*));
-+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *));

(quoted diff) +0 -3
-
-   /* Initialize all pixmap pointers to NULL so that proper destruction can
-      be performed if an error is encountered partway through construction.

*/

(quoted diff) +0 -5
-diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 6208a97..43d98a7 100644
---- a/grub-core/io/gzio.c
-+++ b/grub-core/io/gzio.c
-@@ -554,7 +554,7 @@ huft_build (unsigned *b, /* code lengths in bits

(all assumed <= BMAX) */

(quoted diff) +0 -13
-           z = 1 << j;       /* table entries for j-bit table */
-
-           /* allocate and link in new table */
--          q = (struct huft *) grub_zalloc ((z + 1) * sizeof (struct huft));
-+          q = (struct huft *) grub_calloc (z + 1, sizeof (struct huft));
-           if (! q)
-             {
-               if (h)
-diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 6e1ceb9..dc31caa 100644
---- a/grub-core/kern/efi/efi.c
-+++ b/grub-core/kern/efi/efi.c
-@@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const

grub_efi_guid_t *guid,

(quoted diff) +0 -9
-
-   len = grub_strlen (var);
-   len16 = len * GRUB_MAX_UTF16_PER_UTF8;
--  var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));
-+  var16 = grub_calloc (len16 + 1, sizeof (var16[0]));
-   if (!var16)
-     return grub_errno;
-   len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL);
-@@ -237,7 +237,7 @@ grub_efi_get_variable (const char *var, const

grub_efi_guid_t *guid,

(quoted diff) +0 -9
-
-   len = grub_strlen (var);
-   len16 = len * GRUB_MAX_UTF16_PER_UTF8;
--  var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));
-+  var16 = grub_calloc (len16 + 1, sizeof (var16[0]));
-   if (!var16)
-     return NULL;
-   len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL);
-@@ -383,7 +383,7 @@ grub_efi_get_filename (grub_efi_device_path_t

*dp0)

(quoted diff) +0 -9
-       while (len > 0 && fp->path_name[len - 1] == 0)
-         len--;
-
--      dup_name = grub_malloc (len * sizeof (*dup_name));
-+      dup_name = grub_calloc (len, sizeof (*dup_name));
-       if (!dup_name)
-         {
-           grub_free (name);
-diff --git a/grub-core/kern/emu/hostdisk.c b/grub-

core/kern/emu/hostdisk.c

(quoted diff) +0 -17
-index e9ec680..d975265 100644
---- a/grub-core/kern/emu/hostdisk.c
-+++ b/grub-core/kern/emu/hostdisk.c
-@@ -615,7 +615,7 @@ static char *
- grub_util_path_concat_real (size_t n, int ext, va_list ap)
- {
-   size_t totlen = 0;
--  char **l = xmalloc ((n + ext) * sizeof (l[0]));
-+  char **l = xcalloc (n + ext, sizeof (l[0]));
-   char *r, *p, *pi;
-   size_t i;
-   int first = 1;
-diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index 2b85f49..f90be65 100644
---- a/grub-core/kern/fs.c
-+++ b/grub-core/kern/fs.c
-@@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char

*name)

(quoted diff) +0 -13
-   while (p);
-
-   /* Allocate a block list.  */
--  blocks = grub_zalloc (sizeof (struct grub_fs_block) * (num + 1));
-+  blocks = grub_calloc (num + 1, sizeof (struct grub_fs_block));
-   if (! blocks)
-     return 0;
-
-diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d5..a7abd36 100644
---- a/grub-core/kern/misc.c
-+++ b/grub-core/kern/misc.c
-@@ -690,7 +690,7 @@ parse_printf_args (const char *fmt0, struct

printf_args *args,

(quoted diff) +0 -35
-     args->ptr = args->prealloc;
-   else
-     {
--      args->ptr = grub_malloc (args->count * sizeof (args->ptr[0]));
-+      args->ptr = grub_calloc (args->count, sizeof (args->ptr[0]));
-       if (!args->ptr)
-     {
-       grub_errno = GRUB_ERR_NONE;
-diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 78175aa..619db31 100644
---- a/grub-core/kern/parser.c
-+++ b/grub-core/kern/parser.c
-@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,
-     return grub_errno;
-   grub_memcpy (args, buffer, bp - buffer);
-
--  *argv = grub_malloc (sizeof (char *) * (*argc + 1));
-+  *argv = grub_calloc (*argc + 1, sizeof (char *));
-   if (!*argv)
-     {
-       grub_free (args);
-diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
-index be4816f..aac8f9a 100644
---- a/grub-core/kern/uboot/uboot.c
-+++ b/grub-core/kern/uboot/uboot.c
-@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)
-     return num_devices;
-
-   max_devices = 2;
--  enum_devices = grub_malloc (sizeof(struct device_info) * max_devices);
-+  enum_devices = grub_calloc (max_devices, sizeof(struct device_info));
-   if (!enum_devices)
-     return 0;
-
-diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-

core/lib/libgcrypt/cipher/ac.c
-index f5e946a..63f6fcd 100644
---- a/grub-core/lib/libgcrypt/cipher/ac.c
-+++ b/grub-core/lib/libgcrypt/cipher/ac.c
-@@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n,

(quoted diff) +0 -9
-   gcry_mpi_t mpi;
-   char *label;
-
--  data_mpis_new = gcry_malloc (sizeof (*data_mpis_new) * data_mpis_n);
-+  data_mpis_new = gcry_calloc (data_mpis_n, sizeof (*data_mpis_new));
-   if (! data_mpis_new)
-     {
-       err = gcry_error_from_errno (errno);
-@@ -572,7 +572,7 @@ _gcry_ac_data_to_sexp (gcry_ac_data_t data,

gcry_sexp_t *sexp,

(quoted diff) +0 -9
-     }
-
-   /* Add MPI list.  */
--  arg_list = gcry_malloc (sizeof (*arg_list) * (data_n + 1));
-+  arg_list = gcry_calloc (data_n + 1, sizeof (*arg_list));
-   if (! arg_list)
-     {
-       err = gcry_error_from_errno (errno);
-@@ -1283,7 +1283,7 @@ ac_data_construct (const char *identifier, int

include_flags,

(quoted diff) +0 -9
-   /* We build a list of arguments to pass to
-      gcry_sexp_build_array().  */
-   data_length = _gcry_ac_data_length (data);
--  arg_list = gcry_malloc (sizeof (*arg_list) * (data_length * 2));
-+  arg_list = gcry_calloc (data_length, sizeof (*arg_list) * 2);
-   if (! arg_list)
-     {
-       err = gcry_error_from_errno (errno);
-@@ -1593,7 +1593,7 @@ _gcry_ac_key_pair_generate (gcry_ac_handle_t

handle, unsigned int nbits,

(quoted diff) +0 -9
-     arg_list_n += 2;
-
-   /* Allocate list.  */
--  arg_list = gcry_malloc (sizeof (*arg_list) * arg_list_n);
-+  arg_list = gcry_calloc (arg_list_n, sizeof (*arg_list));
-   if (! arg_list)
-     {
-       err = gcry_error_from_errno (errno);
-diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-

core/lib/libgcrypt/cipher/primegen.c

(quoted diff) +0 -13
-index 2788e34..b12e79b 100644
---- a/grub-core/lib/libgcrypt/cipher/primegen.c
-+++ b/grub-core/lib/libgcrypt/cipher/primegen.c
-@@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor,
-     }
-
-   /* Allocate an array to track pool usage. */
--  pool_in_use = gcry_malloc (n * sizeof *pool_in_use);
-+  pool_in_use = gcry_calloc (n, sizeof *pool_in_use);
-   if (!pool_in_use)
-     {
-       err = gpg_err_code_from_errno (errno);
-@@ -765,7 +765,7 @@ gen_prime (unsigned int nbits, int secret, int

randomlevel,

(quoted diff) +0 -9
-   if (nbits < 16)
-     log_fatal ("can't generate a prime with less than %d bits\n", 16);
-
--  mods = gcry_xmalloc( no_of_small_prime_numbers * sizeof *mods );
-+  mods = gcry_xcalloc( no_of_small_prime_numbers, sizeof *mods);
-   /* Make nbits fit into gcry_mpi_t implementation. */
-   val_2  = mpi_alloc_set_ui( 2 );
-   val_3 = mpi_alloc_set_ui( 3);
-diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-

core/lib/libgcrypt/cipher/pubkey.c
-index 9109821..ca087ad 100644
---- a/grub-core/lib/libgcrypt/cipher/pubkey.c -+++ b/grub-core/lib/libgcrypt/cipher/pubkey.c
-@@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey)

(quoted diff) +0 -9
-        * array to a format string, so we have to do it this way :-(.  */
-       /* FIXME: There is now such a format specifier, so we can
-          change the code to be more clear. */
--      arg_list = malloc (nelem * sizeof *arg_list);
-+      arg_list = calloc (nelem, sizeof *arg_list);
-       if (!arg_list)
-         {
-           rc = gpg_err_code_from_syserror ();
-@@ -3233,7 +3233,7 @@ gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t

s_hash, gcry_sexp_t s_skey)

(quoted diff) +0 -34
-         }
-       strcpy (p, "))");
-
--      arg_list = malloc (nelem * sizeof *arg_list);
-+      arg_list = calloc (nelem, sizeof *arg_list);
-       if (!arg_list)
-         {
-           rc = gpg_err_code_from_syserror ();
-diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c
-index 659be0b..7d5e7c0 100644
---- a/grub-core/lib/priority_queue.c
-+++ b/grub-core/lib/priority_queue.c
-@@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize,
- {
-   struct grub_priority_queue *ret;
-   void *els;
--  els = grub_malloc (elsize * 8);
-+  els = grub_calloc (8, elsize);
-   if (!els)
-     return 0;
-   ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret));
-diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
-index ee9fa7b..467305b 100644
---- a/grub-core/lib/reed_solomon.c
-+++ b/grub-core/lib/reed_solomon.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#define xcalloc calloc
- #define xmalloc malloc
- #define grub_memset memset
- #define grub_memcpy memcpy
-@@ -158,11 +159,9 @@ rs_encode (gf_single_t *data, grub_size_t s,

grub_size_t rs)

(quoted diff) +0 -39
-   gf_single_t *rs_polynomial;
-   int i, j;
-   gf_single_t *m;
--  m = xmalloc ((s + rs) * sizeof (gf_single_t));
-+  m = xcalloc (s + rs, sizeof (gf_single_t));
-   grub_memcpy (m, data, s * sizeof (gf_single_t));
--  grub_memset (m + s, 0, rs * sizeof (gf_single_t));
--  rs_polynomial = xmalloc ((rs + 1) * sizeof (gf_single_t));
--  grub_memset (rs_polynomial, 0, (rs + 1) * sizeof (gf_single_t));
-+  rs_polynomial = xcalloc (rs + 1, sizeof (gf_single_t));
-   rs_polynomial[rs] = 1;
-   /* Multiply with X - a^r */
-   for (j = 0; j < rs; j++)
-diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index ea3ebc7..5847aac 100644
---- a/grub-core/lib/relocator.c
-+++ b/grub-core/lib/relocator.c
-@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
-   }
- #endif
-
--  eventt = grub_malloc (maxevents * sizeof (events[0]));
-+  eventt = grub_calloc (maxevents, sizeof (events[0]));
-   counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0]));
--  events = grub_malloc (maxevents * sizeof (events[0]));
-+  events = grub_calloc (maxevents, sizeof (events[0]));
-   if (!events || !eventt || !counter)
-     {
-       grub_dprintf ("relocator", "events or counter allocation failed %d\n",
-@@ -963,7 +963,7 @@ malloc_in_range (struct grub_relocator *rel,
- #endif
-     unsigned cural = 0;
-     int oom = 0;
--    res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs);
-+    res->subchunks = grub_calloc (nallocs, sizeof (res->subchunks[0]));
-     if (!res->subchunks)
-       oom = 1;
-     res->nsubchunks = nallocs;
-@@ -1562,8 +1562,8 @@ grub_relocator_prepare_relocs (struct

grub_relocator *rel, grub_addr_t addr,

(quoted diff) +0 -11
-         count[(chunk->src & 0xff) + 1]++;
-       }
-     }
--    from = grub_malloc (nchunks * sizeof (sorted[0]));
--    to = grub_malloc (nchunks * sizeof (sorted[0]));
-+    from = grub_calloc (nchunks, sizeof (sorted[0]));
-+    to = grub_calloc (nchunks, sizeof (sorted[0]));
-     if (!from || !to)
-       {
-     grub_free (from);
-diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-

core/lib/zstd/fse_decompress.c

(quoted diff) +0 -7
-index 72bbead..2227b84 100644
---- a/grub-core/lib/zstd/fse_decompress.c
-+++ b/grub-core/lib/zstd/fse_decompress.c
-@@ -82,7 +82,7 @@
- FSE_DTable* FSE_createDTable (unsigned tableLog)
- {
-     if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog =

FSE_TABLELOG_ABSOLUTE_MAX;
-- return (FSE_DTable*)malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof
(U32) );
-+ return (FSE_DTable*)calloc( FSE_DTABLE_SIZE_U32(tableLog), sizeof
(U32) );
- }

(quoted diff) +0 -16
-
- void FSE_freeDTable (FSE_DTable* dt)
-diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 5168491..d70c174 100644
---- a/grub-core/loader/arm/linux.c
-+++ b/grub-core/loader/arm/linux.c
-@@ -78,7 +78,7 @@ linux_prepare_atag (void *target_atag)
-
-   /* some place for cmdline, initrd and terminator.  */
-   tmp_size = get_atag_size (atag_orig) + 20 + (arg_size) / 4;
--  tmp_atag = grub_malloc (tmp_size * sizeof (grub_uint32_t));
-+  tmp_atag = grub_calloc (tmp_size, sizeof (grub_uint32_t));
-   if (!tmp_atag)
-     return grub_errno;
-
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-

core/loader/efi/chainloader.c
-index cd92ea3..daf8c6b 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -116,7 +116,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,

(quoted diff) +0 -4
-   fp->header.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE;
-   fp->header.subtype = GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE;
-
--  path_name = grub_malloc (len * GRUB_MAX_UTF16_PER_UTF8 * sizeof

(*path_name));
-+ path_name = grub_calloc (len, GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name));

(quoted diff) +0 -8
-   if (!path_name)
-     return;
-
-diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
-index af6741d..a8d8bf7 100644
---- a/grub-core/loader/i386/bsdXX.c
-+++ b/grub-core/loader/i386/bsdXX.c
-@@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename,

Elf_Ehdr *e, char **shdr)

(quoted diff) +0 -2
-   if (e->e_ident[EI_CLASS] != SUFFIX (ELFCLASS))
-     return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF

magic"));

(quoted diff) +0 -11
-
--  *shdr = grub_malloc ((grub_uint32_t) e->e_shnum * e->e_shentsize);
-+  *shdr = grub_calloc (e->e_shnum, e->e_shentsize);
-   if (! *shdr)
-     return grub_errno;
-
-diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index e64ed08..b7d176b 100644
---- a/grub-core/loader/i386/xnu.c
-+++ b/grub-core/loader/i386/xnu.c
-@@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct

grub_xnu_devprop_device_descriptor *d

(quoted diff) +0 -9
-     return grub_errno;
-
-   len = grub_strlen (name);
--  utf16 = grub_malloc (sizeof (grub_uint16_t) * len);
-+  utf16 = grub_calloc (len, sizeof (grub_uint16_t));
-   if (!utf16)
-     {
-       grub_free (utf8);
-@@ -331,7 +331,7 @@ grub_xnu_devprop_add_property_utf16 (struct

grub_xnu_devprop_device_descriptor *

(quoted diff) +0 -13
-   grub_uint16_t *utf16;
-   grub_err_t err;
-
--  utf16 = grub_malloc (sizeof (grub_uint16_t) * namelen);
-+  utf16 = grub_calloc (namelen, sizeof (grub_uint16_t));
-   if (!utf16)
-     return grub_errno;
-   grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen);
-diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
-index 085f9c6..05710c4 100644
---- a/grub-core/loader/macho.c
-+++ b/grub-core/loader/macho.c
-@@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char

*filename, int is_64bit)

(quoted diff) +0 -9
-       if (grub_file_seek (macho->file, sizeof (struct grub_macho_fat_header))
-       == (grub_off_t) -1)
-     goto fail;
--      archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs);
-+      archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch));
-       if (!archs)
-     goto fail;
-       if (grub_file_read (macho->file, archs,
-diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-

core/loader/multiboot_elfxx.c
-index 70cd1db..cc68536 100644
---- a/grub-core/loader/multiboot_elfxx.c
-+++ b/grub-core/loader/multiboot_elfxx.c
-@@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)

(quoted diff) +0 -4
-     {
-       grub_uint8_t *shdr, *shdrptr;
-
--      shdr = grub_malloc ((grub_uint32_t) ehdr->e_shnum * ehdr-
Quoted 1 line

e_shentsize);

-+ shdr = grub_calloc (ehdr->e_shnum, ehdr->e_shentsize);

(quoted diff) +0 -8
-       if (!shdr)
-     return grub_errno;
-
-diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 7f74d1d..77d7060 100644
---- a/grub-core/loader/xnu.c
-+++ b/grub-core/loader/xnu.c
-@@ -800,7 +800,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd

__attribute__ ((unused)),

(quoted diff) +0 -13
-   if (grub_be_to_cpu32 (head.magic) == GRUB_MACHO_FAT_MAGIC)
-     {
-       narchs = grub_be_to_cpu32 (head.nfat_arch);
--      archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs);
-+      archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch));
-       if (! archs)
-     {
-       grub_file_close (file);
-diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 6a31cba..57b4e9a 100644
---- a/grub-core/mmap/mmap.c
-+++ b/grub-core/mmap/mmap.c
-@@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook,

void *hook_data)

(quoted diff) +0 -16
-
-   /* Initialize variables. */
-   ctx.scanline_events = (struct grub_mmap_scan *)
--    grub_malloc (sizeof (struct grub_mmap_scan) * 2 * mmap_num);
-+    grub_calloc (mmap_num, sizeof (struct grub_mmap_scan) * 2);
-
--  present = grub_zalloc (sizeof (present[0]) * current_priority);
-+  present = grub_calloc (current_priority, sizeof (present[0]));
-
-   if (! ctx.scanline_events || !present)
-     {
-diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 04cfbb0..6539572 100644
---- a/grub-core/net/bootp.c
-+++ b/grub-core/net/bootp.c
-@@ -766,7 +766,7 @@ grub_cmd_bootp (struct grub_command *cmd

__attribute__ ((unused)),

(quoted diff) +0 -2
-   if (ncards == 0)
-     return grub_error (GRUB_ERR_NET_NO_CARD, N_("no network card

found"));

(quoted diff) +0 -11
-
--  ifaces = grub_zalloc (ncards * sizeof (ifaces[0]));
-+  ifaces = grub_calloc (ncards, sizeof (ifaces[0]));
-   if (!ifaces)
-     return grub_errno;
-
-diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 5d9afe0..e332d5e 100644
---- a/grub-core/net/dns.c
-+++ b/grub-core/net/dns.c
-@@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock

__attribute__ ((unused)),

(quoted diff) +0 -11
-       ptr++;
-       ptr += 4;
-     }
--  *data->addresses = grub_malloc (sizeof ((*data->addresses)[0])
--                             * grub_be_to_cpu16 (head->ancount));
-+  *data->addresses = grub_calloc (grub_be_to_cpu16 (head->ancount),
-+                              sizeof ((*data->addresses)[0]));
-   if (!*data->addresses)
-     {
-       grub_errno = GRUB_ERR_NONE;
-@@ -406,8 +406,8 @@ recv_hook (grub_net_udp_socket_t sock

__attribute__ ((unused)),

(quoted diff) +0 -5
-       dns_cache[h].addresses = 0;
-       dns_cache[h].name = grub_strdup (data->oname);
-       dns_cache[h].naddresses = *data->naddresses;
--      dns_cache[h].addresses = grub_malloc (*data->naddresses
--                                        * sizeof

(dns_cache[h].addresses[0]));
-+ dns_cache[h].addresses = grub_calloc (*data->naddresses,
-+ sizeof
(dns_cache[h].addresses[0]));

(quoted diff) +0 -17
-       dns_cache[h].limit_time = grub_get_time_ms () + 1000 * ttl_all;
-       if (!dns_cache[h].addresses || !dns_cache[h].name)
-     {
-@@ -479,7 +479,7 @@ grub_net_dns_lookup (const char *name,
-     }
-     }
-
--  sockets = grub_malloc (sizeof (sockets[0]) * n_servers);
-+  sockets = grub_calloc (n_servers, sizeof (sockets[0]));
-   if (!sockets)
-     return grub_errno;
-
-diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index d5d726a..38f19df 100644
---- a/grub-core/net/net.c
-+++ b/grub-core/net/net.c
-@@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command

*cmd __attribute__ ((unused)),

(quoted diff) +0 -15
-     ncards++;
-   }
-
--  ifaces = grub_zalloc (ncards * sizeof (ifaces[0]));
--  slaacs = grub_zalloc (ncards * sizeof (slaacs[0]));
-+  ifaces = grub_calloc (ncards, sizeof (ifaces[0]));
-+  slaacs = grub_calloc (ncards, sizeof (slaacs[0]));
-   if (!ifaces || !slaacs)
-     {
-       grub_free (ifaces);
-diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index b0ab47d..d57fb72 100644
---- a/grub-core/normal/charset.c
-+++ b/grub-core/normal/charset.c
-@@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg,

grub_uint32_t **unicode_msg,
- {

(quoted diff) +0 -8
-   grub_size_t msg_len = grub_strlen (msg);
-
--  *unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
-+  *unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t));
-
-   if (!*unicode_msg)
-     return -1;
-@@ -488,7 +488,7 @@ grub_unicode_aglomerate_comb (const

grub_uint32_t *in, grub_size_t inlen,

(quoted diff) +0 -9
-         }
-       else
-         {
--          n = grub_malloc (sizeof (n[0]) * (out->ncomb + 1));
-+          n = grub_calloc (out->ncomb + 1, sizeof (n[0]));
-           if (!n)
-             {
-               grub_errno = GRUB_ERR_NONE;
-@@ -842,7 +842,7 @@ grub_bidi_line_logical_to_visual (const

grub_uint32_t *logical,

(quoted diff) +0 -9
-       }                                                     \
-   }
-
--  visual = grub_malloc (sizeof (visual[0]) * logical_len);
-+  visual = grub_calloc (logical_len, sizeof (visual[0]));
-   if (!visual)
-     return -1;
-
-@@ -1165,8 +1165,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t

*logical,
- {

(quoted diff) +0 -63
-   const grub_uint32_t *line_start = logical, *ptr;
-   struct grub_unicode_glyph *visual_ptr;
--  *visual_out = visual_ptr = grub_malloc (3 * sizeof (visual_ptr[0])
--                                      * (logical_len + 2));
-+  *visual_out = visual_ptr = grub_calloc (logical_len + 2,
-+                                      3 * sizeof (visual_ptr[0]));
-   if (!visual_ptr)
-     return -1;
-   for (ptr = logical; ptr <= logical + logical_len; ptr++)
-diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c037d50..c57242e 100644
---- a/grub-core/normal/cmdline.c
-+++ b/grub-core/normal/cmdline.c
-@@ -41,7 +41,7 @@ grub_err_t
- grub_set_history (int newsize)
- {
-   grub_uint32_t **old_hist_lines = hist_lines;
--  hist_lines = grub_malloc (sizeof (grub_uint32_t *) * newsize);
-+  hist_lines = grub_calloc (newsize, sizeof (grub_uint32_t *));
-
-   /* Copy the old lines into the new buffer.  */
-   if (old_hist_lines)
-@@ -114,7 +114,7 @@ static void
- grub_history_set (int pos, grub_uint32_t *s, grub_size_t len)
- {
-   grub_free (hist_lines[pos]);
--  hist_lines[pos] = grub_malloc ((len + 1) * sizeof (grub_uint32_t));
-+  hist_lines[pos] = grub_calloc (len + 1, sizeof (grub_uint32_t));
-   if (!hist_lines[pos])
-     {
-       grub_print_error ();
-@@ -349,7 +349,7 @@ grub_cmdline_get (const char *prompt_translated)
-   char *ret;
-   unsigned nterms;
-
--  buf = grub_malloc (max_len * sizeof (grub_uint32_t));
-+  buf = grub_calloc (max_len, sizeof (grub_uint32_t));
-   if (!buf)
-     return 0;
-
-@@ -377,7 +377,7 @@ grub_cmdline_get (const char *prompt_translated)
-     FOR_ACTIVE_TERM_OUTPUTS(cur)
-       nterms++;
-
--    cl_terms = grub_malloc (sizeof (cl_terms[0]) * nterms);
-+    cl_terms = grub_calloc (nterms, sizeof (cl_terms[0]));
-     if (!cl_terms)
-       {
-     grub_free (buf);
-@@ -385,7 +385,7 @@ grub_cmdline_get (const char *prompt_translated)
-       }
-     cl_term_cur = cl_terms;
-
--    unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
-+    unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t));
-     if (!unicode_msg)
-       {
-     grub_free (buf);
-@@ -495,7 +495,7 @@ grub_cmdline_get (const char *prompt_translated)
-             grub_uint32_t *insert;
-
-             insertlen = grub_strlen (insertu8);
--            insert = grub_malloc ((insertlen + 1) * sizeof

(grub_uint32_t));
-+ insert = grub_calloc (insertlen + 1, sizeof (grub_uint32_t));

(quoted diff) +0 -13
-             if (!insert)
-               {
-                 grub_free (insertu8);
-@@ -602,7 +602,7 @@ grub_cmdline_get (const char *prompt_translated)
-
-           grub_free (kill_buf);
-
--          kill_buf = grub_malloc ((n + 1) * sizeof(grub_uint32_t));
-+          kill_buf = grub_calloc (n + 1, sizeof (grub_uint32_t));
-           if (grub_errno)
-             {
-               grub_print_error ();
-diff --git a/grub-core/normal/menu_entry.c b/grub-

core/normal/menu_entry.c

(quoted diff) +0 -15
-index cdf3590..1993995 100644
---- a/grub-core/normal/menu_entry.c
-+++ b/grub-core/normal/menu_entry.c
-@@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep)
- {
-   linep->len = 0;
-   linep->max_len = 80;
--  linep->buf = grub_malloc ((linep->max_len + 1) * sizeof (linep->buf[0]));
--  linep->pos = grub_zalloc (screen->nterms * sizeof (linep->pos[0]));
-+  linep->buf = grub_calloc (linep->max_len + 1, sizeof (linep->buf[0]));
-+  linep->pos = grub_calloc (screen->nterms, sizeof (linep->pos[0]));
-   if (! linep->buf || !linep->pos)
-     {
-       grub_free (linep->buf);
-@@ -287,7 +287,7 @@ update_screen (struct screen *screen, struct

per_term_screen *term_screen,

(quoted diff) +0 -9
-       pos = linep->pos + (term_screen - screen->terms);
-
-       if (!*pos)
--        *pos = grub_zalloc ((linep->len + 1) * sizeof (**pos));
-+        *pos = grub_calloc (linep->len + 1, sizeof (**pos));
-
-       if (i == region_start || linep == screen->lines + screen->line
-           || (i > region_start && mode == ALL_LINES))
-@@ -471,7 +471,7 @@ insert_string (struct screen *screen, const char *s,

int update)

(quoted diff) +0 -9
-
-       /* Insert the string.  */
-       current_linep = screen->lines + screen->line;
--      unicode_msg = grub_malloc ((p - s) * sizeof (grub_uint32_t));
-+      unicode_msg = grub_calloc (p - s, sizeof (grub_uint32_t));
-
-       if (!unicode_msg)
-         return 0;
-@@ -1023,7 +1023,7 @@ complete (struct screen *screen, int continuous,

int update)

(quoted diff) +0 -9
-   if (completion_buffer.buf)
-     {
-       buflen = grub_strlen (completion_buffer.buf);
--      ucs4 = grub_malloc (sizeof (grub_uint32_t) * (buflen + 1));
-+      ucs4 = grub_calloc (buflen + 1, sizeof (grub_uint32_t));
-
-       if (!ucs4)
-     {
-@@ -1268,7 +1268,7 @@ grub_menu_entry_run (grub_menu_entry_t

entry)

(quoted diff) +0 -4
-   for (i = 0; i < (unsigned) screen->num_lines; i++)
-     {
-       grub_free (screen->lines[i].pos);
--      screen->lines[i].pos = grub_zalloc (screen->nterms * sizeof (screen-
Quoted 1 line

lines[i].pos[0]));

-+ screen->lines[i].pos = grub_calloc (screen->nterms, sizeof (screen-

Quoted 1 line

lines[i].pos[0]));

(quoted diff) +0 -4
-       if (! screen->lines[i].pos)
-     {
-       grub_print_error ();
-@@ -1278,7 +1278,7 @@ grub_menu_entry_run (grub_menu_entry_t

entry)

(quoted diff) +0 -4
-     }
-     }
-
--  screen->terms = grub_zalloc (screen->nterms * sizeof (screen-
Quoted 1 line

terms[0]));

-+ screen->terms = grub_calloc (screen->nterms, sizeof (screen->terms[0]));

(quoted diff) +0 -4
-   if (!screen->terms)
-     {
-       grub_print_error ();
-diff --git a/grub-core/normal/menu_text.c b/grub-

core/normal/menu_text.c
-index e22bb91..18240e7 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left,

(quoted diff) +0 -9
-   grub_size_t msg_len = grub_strlen (msg) + 2;
-   int ret = 0;
-
--  unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
-+  unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t));
-
-   if (!unicode_msg)
-     return 0;
-@@ -211,7 +211,7 @@ print_entry (int y, int highlight, grub_menu_entry_t

entry,

(quoted diff) +0 -22
-
-   title = entry ? entry->title : "";
-   title_len = grub_strlen (title);
--  unicode_title = grub_malloc (title_len * sizeof (*unicode_title));
-+  unicode_title = grub_calloc (title_len, sizeof (*unicode_title));
-   if (! unicode_title)
-     /* XXX How to show this error?  */
-     return;
-diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
-index a1e5c5a..cc8c173 100644
---- a/grub-core/normal/term.c
-+++ b/grub-core/normal/term.c
-@@ -264,7 +264,7 @@ grub_term_save_pos (void)
-   FOR_ACTIVE_TERM_OUTPUTS(cur)
-     cnt++;
-
--  ret = grub_malloc (cnt * sizeof (ret[0]));
-+  ret = grub_calloc (cnt, sizeof (ret[0]));
-   if (!ret)
-     return NULL;
-
-@@ -1013,7 +1013,7 @@ grub_xnputs (const char *str, grub_size_t

msg_len)

(quoted diff) +0 -9
-
-   grub_error_push ();
-
--  unicode_str = grub_malloc (msg_len * sizeof (grub_uint32_t));
-+  unicode_str = grub_calloc (msg_len, sizeof (grub_uint32_t));
-
-   grub_error_pop ();
-
-diff --git a/grub-core/osdep/linux/getroot.c b/grub-

core/osdep/linux/getroot.c
-index 90d92d3..5b41ad0 100644
---- a/grub-core/osdep/linux/getroot.c
-+++ b/grub-core/osdep/linux/getroot.c
-@@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable)

(quoted diff) +0 -9
-   if (ret != 0)
-     grub_util_error (_("ioctl GET_ARRAY_INFO error: %s"), strerror (errno));
-
--  devicelist = xmalloc ((info.nr_disks + 1) * sizeof (char *));
-+  devicelist = xcalloc (info.nr_disks + 1, sizeof (char *));
-
-   for (i = 0, j = 0; j < info.nr_disks; i++)
-     {
-@@ -241,7 +241,7 @@ grub_find_root_devices_from_btrfs (const char

*dir)

(quoted diff) +0 -9
-       return NULL;
-     }
-
--  ret = xmalloc ((fsi.num_devices + 1) * sizeof (ret[0]));
-+  ret = xcalloc (fsi.num_devices + 1, sizeof (ret[0]));
-
-   for (i = 1; i <= fsi.max_id && j < fsi.num_devices; i++)
-     {
-@@ -396,7 +396,7 @@ grub_find_root_devices_from_mountinfo (const

char *dir, char **relroot)

(quoted diff) +0 -22
-   if (relroot)
-     *relroot = NULL;
-
--  entries = xmalloc (entry_max * sizeof (*entries));
-+  entries = xcalloc (entry_max, sizeof (*entries));
-
- again:
-   fp = grub_util_fopen ("/proc/self/mountinfo", "r");
-diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 65effa9..7d63251 100644
---- a/grub-core/osdep/unix/config.c
-+++ b/grub-core/osdep/unix/config.c
-@@ -89,7 +89,7 @@ grub_util_load_config (struct grub_util_config *cfg)
-   argv[0] = "sh";
-   argv[1] = "-c";
-
--  script = xmalloc (4 * strlen (cfgfile) + 300);
-+  script = xcalloc (4, strlen (cfgfile) + 300);
-
-   ptr = script;
-   memcpy (ptr, ". '", 3);
-diff --git a/grub-core/osdep/windows/getroot.c b/grub-

core/osdep/windows/getroot.c

(quoted diff) +0 -13
-index 661d954..eada663 100644
---- a/grub-core/osdep/windows/getroot.c
-+++ b/grub-core/osdep/windows/getroot.c
-@@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path)
-
-   for (ptr = path; *ptr; ptr++);
-   allocsize = (ptr - path + 10) * 2;
--  out = xmalloc (allocsize * sizeof (out[0]));
-+  out = xcalloc (allocsize, sizeof (out[0]));
-
-   /* When pointing to EFI system partition GetVolumePathName fails
-      for ESP root and returns abberant information for everything
-diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-

core/osdep/windows/hostdisk.c
-index 3551007..0be3273 100644
---- a/grub-core/osdep/windows/hostdisk.c
-+++ b/grub-core/osdep/windows/hostdisk.c
-@@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path)

(quoted diff) +0 -11
-
-   while (1)
-     {
--      fpa = xmalloc (alloc * sizeof (fpa[0]));
-+      fpa = xcalloc (alloc, sizeof (fpa[0]));
-
-       len = GetFullPathName (tpath, alloc, fpa, NULL);
-       if (len >= alloc)
-@@ -399,7 +399,7 @@ grub_util_fd_opendir (const char *name)
-   for (l = 0; name_windows[l]; l++);
-   for (l--; l >= 0 && (name_windows[l] == '\\' || name_windows[l] == '/'); l--

);

(quoted diff) +0 -7
-   l++;
--  pattern = xmalloc ((l + 3) * sizeof (pattern[0]));
-+  pattern = xcalloc (l + 3, sizeof (pattern[0]));
-   memcpy (pattern, name_windows, l * sizeof (pattern[0]));
-   pattern[l] = '\\';
-   pattern[l + 1] = '*';
-diff --git a/grub-core/osdep/windows/init.c b/grub-

core/osdep/windows/init.c
-index e8ffd62..6297de6 100644
---- a/grub-core/osdep/windows/init.c
-+++ b/grub-core/osdep/windows/init.c
-@@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),

(quoted diff) +0 -9
-   LPWSTR *targv;
-
-   targv = CommandLineToArgvW (tcmdline, argc);
--  *argv = xmalloc ((*argc + 1) * sizeof (argv[0]));
-+  *argv = xcalloc (*argc + 1, sizeof (argv[0]));
-
-   for (i = 0; i < *argc; i++)
-     (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]);
-diff --git a/grub-core/osdep/windows/platform.c b/grub-

core/osdep/windows/platform.c
-index 7eb53fe..1ef86bf 100644
---- a/grub-core/osdep/windows/platform.c
-+++ b/grub-core/osdep/windows/platform.c
-@@ -225,8 +225,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev,
- grub_util_error ("%s", _("no EFI routines are available when running in
BIOS mode"));

(quoted diff) +0 -6
-
-   distrib8_len = grub_strlen (efi_distributor);
--  distributor16 = xmalloc ((distrib8_len + 1) * GRUB_MAX_UTF16_PER_UTF8
--                       * sizeof (grub_uint16_t));
-+  distributor16 = xcalloc (distrib8_len + 1,
-+                       GRUB_MAX_UTF16_PER_UTF8 * sizeof

(grub_uint16_t));
- distrib16_len = grub_utf8_to_utf16 (distributor16, distrib8_len *
GRUB_MAX_UTF16_PER_UTF8,

(quoted diff) +0 -3
-                                   (const grub_uint8_t *) efi_distributor,
-                                   distrib8_len, 0);
-diff --git a/grub-core/osdep/windows/relpath.c b/grub-

core/osdep/windows/relpath.c
-index cb08617..478e8ef 100644
---- a/grub-core/osdep/windows/relpath.c
-+++ b/grub-core/osdep/windows/relpath.c
-@@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path)

(quoted diff) +0 -13
-       if (dirwindows[0] && dirwindows[1] == ':')
-     offset = 2;
-     }
--  ret = xmalloc (sizeof (ret[0]) * (flen - offset + 2));
-+  ret = xcalloc (flen - offset + 2, sizeof (ret[0]));
-   if (dirwindows[offset] != '\\'
-       && dirwindows[offset] != '/'
-       && dirwindows[offset])
-diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
-index 103f679..72a2e37 100644
---- a/grub-core/partmap/gpt.c
-+++ b/grub-core/partmap/gpt.c
-@@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk,

unsigned int *nsectors,

(quoted diff) +0 -13
-   *nsectors = ctx.len;
-   if (*nsectors > max_nsectors)
-     *nsectors = max_nsectors;
--  *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-+  *sectors = grub_calloc (*nsectors, sizeof (**sectors));
-   if (!*sectors)
-     return grub_errno;
-   for (i = 0; i < *nsectors; i++)
-diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
-index 7b8e450..ee3f249 100644
---- a/grub-core/partmap/msdos.c
-+++ b/grub-core/partmap/msdos.c
-@@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk,

unsigned int *nsectors,

(quoted diff) +0 -13
-       avail_nsectors = *nsectors;
-       if (*nsectors > max_nsectors)
-     *nsectors = max_nsectors;
--      *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-+      *sectors = grub_calloc (*nsectors, sizeof (**sectors));
-       if (!*sectors)
-     return grub_errno;
-       for (i = 0; i < *nsectors; i++)
-diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ee299fd..c8d6806 100644
---- a/grub-core/script/execute.c
-+++ b/grub-core/script/execute.c
-@@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result,

const char *orig_str)

(quoted diff) +0 -4
-   for (iptr = orig_str; *iptr; iptr++)
-     if (*iptr == '$')
-       dollar_cnt++;
--  ctx.allowed_strings = grub_malloc (sizeof (ctx.allowed_strings[0]) *

dollar_cnt);
-+ ctx.allowed_strings = grub_calloc (dollar_cnt, sizeof (ctx.allowed_strings[0]));

(quoted diff) +0 -8
-
-   if (parse_string (orig_str, gettext_save_allow, &ctx, 0))
-     goto fail;
-diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c
-index 2d60852..b5eb516 100644
---- a/grub-core/tests/fake_input.c
-+++ b/grub-core/tests/fake_input.c
-@@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int

nseq_in)

(quoted diff) +0 -9
-     saved = grub_term_inputs;
-   if (seq)
-     grub_free (seq);
--  seq = grub_malloc (nseq_in * sizeof (seq[0]));
-+  seq = grub_calloc (nseq_in, sizeof (seq[0]));
-   if (!seq)
-     return;
-
-diff --git a/grub-core/tests/video_checksum.c b/grub-

core/tests/video_checksum.c
-index 74d5b65..44d0810 100644
---- a/grub-core/tests/video_checksum.c
-+++ b/grub-core/tests/video_checksum.c
-@@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname,

(quoted diff) +0 -9
-     {
-     case 4:
-       {
--    grub_uint8_t *buffer = xmalloc (mode_info->width * 3);
-+    grub_uint8_t *buffer = xcalloc (3, mode_info->width);
-     grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1);
-     grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1);
-     grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1);
-@@ -367,7 +367,7 @@ grub_video_capture_write_bmp (const char

*fname,

(quoted diff) +0 -9
-       }
-     case 3:
-       {
--    grub_uint8_t *buffer = xmalloc (mode_info->width * 3);
-+    grub_uint8_t *buffer = xcalloc (3, mode_info->width);
-     grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1);
-     grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1);
-     grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1);
-@@ -407,7 +407,7 @@ grub_video_capture_write_bmp (const char

*fname,

(quoted diff) +0 -13
-       }
-     case 2:
-       {
--    grub_uint8_t *buffer = xmalloc (mode_info->width * 3);
-+    grub_uint8_t *buffer = xcalloc (3, mode_info->width);
-     grub_uint16_t rmask = ((1 << mode_info->red_mask_size) - 1);
-     grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1);
-     grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1);
-diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
-index 4f83c74..4d3195e 100644
---- a/grub-core/video/capture.c
-+++ b/grub-core/video/capture.c
-@@ -89,7 +89,7 @@ grub_video_capture_start (const struct

grub_video_mode_info *mode_info,

(quoted diff) +0 -2
-   framebuffer.mode_info = *mode_info;
-   framebuffer.mode_info.blit_format = grub_video_get_blit_format

(&framebuffer.mode_info);
-
-- framebuffer.ptr = grub_malloc (framebuffer.mode_info.height * framebuffer.mode_info.pitch);
-+ framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch);

(quoted diff) +0 -8
-   if (!framebuffer.ptr)
-     return grub_errno;
-
-diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c
-index a2f639f..0ebab6f 100644
---- a/grub-core/video/emu/sdl.c
-+++ b/grub-core/video/emu/sdl.c
-@@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start,

unsigned int count,

(quoted diff) +0 -13
-       if (start + count > mode_info.number_of_colors)
-     count = mode_info.number_of_colors - start;
-
--      tmp = grub_malloc (count * sizeof (tmp[0]));
-+      tmp = grub_calloc (count, sizeof (tmp[0]));
-       for (i = 0; i < count; i++)
-     {
-       tmp[i].r = palette_data[i].r;
-diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c
-index 01f4711..b2f776c 100644
---- a/grub-core/video/i386/pc/vga.c
-+++ b/grub-core/video/i386/pc/vga.c
-@@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width,

unsigned int height,

(quoted diff) +0 -4
-
-   vga_height = height ? : 480;
-
--  framebuffer.temporary_buffer = grub_malloc (vga_height *

VGA_WIDTH);
-+ framebuffer.temporary_buffer = grub_calloc (vga_height, VGA_WIDTH);

(quoted diff) +0 -4
-   framebuffer.front_page = 0;
-   framebuffer.back_page = 0;
-   if (!framebuffer.temporary_buffer)
-diff --git a/grub-core/video/readers/png.c b/grub-

core/video/readers/png.c
-index 777e713..61bd645 100644
---- a/grub-core/video/readers/png.c
-+++ b/grub-core/video/readers/png.c
-@@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data)

(quoted diff) +0 -4
-   if (data->is_16bit || data->is_gray || data->is_palette)
- #endif
-     {
--      data->image_data = grub_malloc (data->image_height * data-
Quoted 1 line

row_bytes);

-+ data->image_data = grub_calloc (data->image_height, data-

Quoted 1 line

row_bytes);

(quoted diff) +0 -8
-       if (grub_errno)
-         return grub_errno;
-
-diff --git a/include/grub/unicode.h b/include/grub/unicode.h
-index a0403e9..4de986a 100644
---- a/include/grub/unicode.h
-+++ b/include/grub/unicode.h
-@@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct

grub_unicode_glyph *in)

(quoted diff) +0 -4
-   grub_memcpy (out, in, sizeof (*in));
-   if (in->ncomb > ARRAY_SIZE (out->combining_inline))
-     {
--      out->combining_ptr = grub_malloc (in->ncomb * sizeof (out-
Quoted 1 line

combining_ptr[0]));

-+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out-

Quoted 1 line

combining_ptr[0]));

(quoted diff) +0 -4
-       if (!out->combining_ptr)
-     {
-       grub_free (out);
-@@ -315,7 +315,7 @@ grub_unicode_set_glyph (struct

grub_unicode_glyph *out,

(quoted diff) +0 -4
-   grub_memcpy (out, in, sizeof (*in));
-   if (in->ncomb > ARRAY_SIZE (out->combining_inline))
-     {
--      out->combining_ptr = grub_malloc (in->ncomb * sizeof (out-
Quoted 1 line

combining_ptr[0]));

-+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out-

Quoted 1 line

combining_ptr[0]));

(quoted diff) +0 -34
-       if (!out->combining_ptr)
-     return;
-       grub_memcpy (out->combining_ptr, in->combining_ptr,
-diff --git a/util/getroot.c b/util/getroot.c
-index 847406f..a5eaa64 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -200,7 +200,7 @@ make_device_name (const char *drive)
-   char *ret, *ptr;
-   const char *iptr;
-
--  ret = xmalloc (strlen (drive) * 2);
-+  ret = xcalloc (2, strlen (drive));
-   ptr = ret;
-   for (iptr = drive; *iptr; iptr++)
-     {
-diff --git a/util/grub-file.c b/util/grub-file.c
-index 50c18b6..b2e7dd6 100644
---- a/util/grub-file.c
-+++ b/util/grub-file.c
-@@ -54,7 +54,7 @@ main (int argc, char *argv[])
-
-   grub_util_host_init (&argc, &argv);
-
--  argv2 = xmalloc (argc * sizeof (argv2[0]));
-+  argv2 = xcalloc (argc, sizeof (argv2[0]));
-
-   if (argc == 2 && strcmp (argv[1], "--version") == 0)
-     {
-diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index f14e02d..57246af 100644
---- a/util/grub-fstest.c
-+++ b/util/grub-fstest.c
-@@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state

*state)

(quoted diff) +0 -22
-   if (args_count < num_disks)
-     {
-       if (args_count == 0)
--    images = xmalloc (num_disks * sizeof (images[0]));
-+    images = xcalloc (num_disks, sizeof (images[0]));
-       images[args_count] = grub_canonicalize_file_name (arg);
-       args_count++;
-       return 0;
-@@ -734,7 +734,7 @@ main (int argc, char *argv[])
-
-   grub_util_host_init (&argc, &argv);
-
--  args = xmalloc (argc * sizeof (args[0]));
-+  args = xcalloc (argc, sizeof (args[0]));
-
-   argp_parse (&argp, argc, argv, 0, 0, 0);
-
-diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index ca0ac61..0295d40 100644
---- a/util/grub-install-common.c
-+++ b/util/grub-install-common.c
-@@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char

*val,

(quoted diff) +0 -13
-       il->n_entries++;
-     }
-   il->n_alloc = il->n_entries + 1;
--  il->entries = xmalloc (il->n_alloc * sizeof (il->entries[0]));
-+  il->entries = xcalloc (il->n_alloc, sizeof (il->entries[0]));
-   ptr = val;
-   for (ce = il->entries; ; ce++)
-     {
-diff --git a/util/grub-install.c b/util/grub-install.c
-index 8a55ad4..a82725f 100644
---- a/util/grub-install.c
-+++ b/util/grub-install.c
-@@ -626,7 +626,7 @@ device_map_check_duplicates (const char

*dev_map)

(quoted diff) +0 -22
-   if (! fp)
-     return;
-
--  d = xmalloc (alloced * sizeof (d[0]));
-+  d = xcalloc (alloced, sizeof (d[0]));
-
-   while (fgets (buf, sizeof (buf), fp))
-     {
-@@ -1260,7 +1260,7 @@ main (int argc, char *argv[])
-       ndev++;
-     }
-
--  grub_drives = xmalloc (sizeof (grub_drives[0]) * (ndev + 1));
-+  grub_drives = xcalloc (ndev + 1, sizeof (grub_drives[0]));
-
-   for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,
-        curdrive++)
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index bc087c2..d97d0e7 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char

*kernel_path,
- + grub_host_to_target16 (e->e_shstrndx) *
smd.section_entsize);

(quoted diff) +0 -44
-   smd.strtab = (char *) e + grub_host_to_target_addr (s->sh_offset);
-
--  smd.addrs = xmalloc (sizeof (*smd.addrs) * smd.num_sections);
--  memset (smd.addrs, 0, sizeof (*smd.addrs) * smd.num_sections);
--  smd.vaddrs = xmalloc (sizeof (*smd.vaddrs) * smd.num_sections);
--  memset (smd.vaddrs, 0, sizeof (*smd.vaddrs) * smd.num_sections);
-+  smd.addrs = xcalloc (smd.num_sections, sizeof (*smd.addrs));
-+  smd.vaddrs = xcalloc (smd.num_sections, sizeof (*smd.vaddrs));
-
-   SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);
-
-diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index ce2cbc4..5183102 100644
---- a/util/grub-mkrescue.c
-+++ b/util/grub-mkrescue.c
-@@ -441,8 +441,8 @@ main (int argc, char *argv[])
-   xorriso = xstrdup ("xorriso");
-   label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2");
-
--  argp_argv = xmalloc (sizeof (argp_argv[0]) * argc);
--  xorriso_tail_argv = xmalloc (sizeof (argp_argv[0]) * argc);
-+  argp_argv = xcalloc (argc, sizeof (argp_argv[0]));
-+  xorriso_tail_argv = xcalloc (argc, sizeof (argp_argv[0]));
-
-   xorriso_tail_argc = 0;
-   /* Program name */
-diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
-index 4907d44..edf3097 100644
---- a/util/grub-mkstandalone.c
-+++ b/util/grub-mkstandalone.c
-@@ -296,7 +296,7 @@ main (int argc, char *argv[])
-   grub_util_host_init (&argc, &argv);
-   grub_util_disable_fd_syncs ();
-
--  files = xmalloc ((argc + 1) * sizeof (files[0]));
-+  files = xcalloc (argc + 1, sizeof (files[0]));
-
-   argp_parse (&argp, argc, argv, 0, 0, 0);
-
-diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
-index 0d4084a..1133129 100644
---- a/util/grub-pe2elf.c
-+++ b/util/grub-pe2elf.c
-@@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char

*image,

(quoted diff) +0 -2
-   char *pe_strtab = (image + pe_chdr->symtab_offset
-                  + pe_chdr->num_symbols * sizeof (struct

grub_pe32_symbol));

(quoted diff) +0 -10
-
--  section_map = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (int));
-+  section_map = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (int));
-   section_map[0] = 0;
--  shdr = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (shdr[0]));
-+  shdr = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (shdr[0]));
-   idx = 1;
-   idx_reloc = pe_chdr->num_sections + 1;
-
-@@ -233,7 +233,7 @@ write_reloc_section (FILE* fp, const char *name,

char *image,

(quoted diff) +0 -3
-
-       pe_sec = pe_shdr + shdr[i].sh_link;
-       pe_rel = (struct grub_pe32_reloc *) (image + pe_sec-
Quoted 1 line

relocations_offset);

-- rel = (elf_reloc_t *) xmalloc (pe_sec->num_relocations * sizeof
(elf_reloc_t));
-+ rel = (elf_reloc_t *) xcalloc (pe_sec->num_relocations, sizeof
(elf_reloc_t));

(quoted diff) +0 -4
-       num_rels = 0;
-       modified = 0;
-
-@@ -365,12 +365,10 @@ write_symbol_table (FILE* fp, const char *name,

char *image,
- pe_symtab = (struct grub_pe32_symbol *) (image + pe_chdr-

Quoted 1 line

symtab_offset);

(quoted diff) +0 -6
-   pe_strtab = (char *) (pe_symtab + pe_chdr->num_symbols);
-
--  symtab = (Elf_Sym *) xmalloc ((pe_chdr->num_symbols + 1) *
--                            sizeof (Elf_Sym));
--  memset (symtab, 0, (pe_chdr->num_symbols + 1) * sizeof (Elf_Sym));
-+  symtab = (Elf_Sym *) xcalloc (pe_chdr->num_symbols + 1, sizeof

(Elf_Sym));

(quoted diff) +0 -7
-   num_syms = 1;
-
--  symtab_map = (int *) xmalloc (pe_chdr->num_symbols * sizeof (int));
-+  symtab_map = (int *) xcalloc (pe_chdr->num_symbols, sizeof (int));
-
-   for (i = 0; i < (int) pe_chdr->num_symbols;
-        i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux +

1)

(quoted diff) +0 -5
-diff --git a/util/grub-probe.c b/util/grub-probe.c
-index 81d27ee..cbe6ed9 100644
---- a/util/grub-probe.c
-+++ b/util/grub-probe.c
-@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char

delim)

(quoted diff) +0 -13
-       grub_util_pull_device (*curdev);
-       ndev++;
-     }
--
--  drives_names = xmalloc (sizeof (drives_names[0]) * (ndev + 1));
-+
-+  drives_names = xcalloc (ndev + 1, sizeof (drives_names[0]));
-
-   for (curdev = device_names, curdrive = drives_names; *curdev; curdev++,
-        curdrive++)
---
-2.14.4
-
(quoted diff) +0 -0

CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do- .patch b/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE- 2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch deleted file mode 100644
index 7214ead9a7..0000000000
--- a/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE- 2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch +++ /dev/null

(quoted diff) +0 -1
@@ -1,1330 +0,0 @@
-From eb77d1ef65e25746acff43545f62a71360b15eec Mon Sep 17 00:00:00

2001

(quoted diff) +0 -35
-From: Peter Jones <[email protected]>
-Date: Mon, 15 Jun 2020 12:28:27 -0400
-Subject: [PATCH 6/9] malloc: Use overflow checking primitives where we do
- complex allocations
-
-This attempts to fix the places where we do the following where
-arithmetic_expr may include unvalidated data:
-
-  X = grub_malloc(arithmetic_expr);
-
-It accomplishes this by doing the arithmetic ahead of time using grub_add(),
-grub_sub(), grub_mul() and testing for overflow before proceeding.
-
-Among other issues, this fixes:
-  - allocation of integer overflow in grub_video_bitmap_create()
-    reported by Chris Coulson,
-  - allocation of integer overflow in grub_png_decode_image_header()
-    reported by Chris Coulson,
-  - allocation of integer overflow in grub_squash_read_symlink()
-    reported by Chris Coulson,
-  - allocation of integer overflow in grub_ext2_read_symlink()
-    reported by Chris Coulson,
-  - allocation of integer overflow in read_section_as_string()
-    reported by Chris Coulson.
-
-Fixes: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311
-
-Signed-off-by: Peter Jones <[email protected]>
-Reviewed-by: Daniel Kiper <[email protected]>
-
-Upstream-Status: Backport
-CVE: CVE-2020-14309 CVE-2020-14310 CVE-2020-14311
-
-Reference to upstream patch:
-

https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffb
e4ba99080dc2c570944c6

(quoted diff) +0 -31
-
-Signed-off-by: Yongxin Liu <[email protected]>
----
- grub-core/commands/legacycfg.c | 29 +++++++++++++++++++-----
- grub-core/commands/wildcard.c  | 36 ++++++++++++++++++++++++-----
- grub-core/disk/ldm.c           | 32 ++++++++++++++++++--------
- grub-core/font/font.c          |  7 +++++-
- grub-core/fs/btrfs.c           | 28 +++++++++++++++--------
- grub-core/fs/ext2.c            | 10 ++++++++-
- grub-core/fs/iso9660.c         | 51 +++++++++++++++++++++++++++++-------
------
- grub-core/fs/sfs.c             | 27 +++++++++++++++++-----
- grub-core/fs/squash4.c         | 45 ++++++++++++++++++++++++++++--------
-
- grub-core/fs/udf.c             | 41 +++++++++++++++++++++------------
- grub-core/fs/xfs.c             | 11 +++++----
- grub-core/fs/zfs/zfs.c         | 22 ++++++++++++------
- grub-core/fs/zfs/zfscrypt.c    |  7 +++++-
- grub-core/lib/arg.c            | 20 +++++++++++++++--
- grub-core/loader/i386/bsd.c    |  8 ++++++-
- grub-core/net/dns.c            |  9 +++++++-
- grub-core/normal/charset.c     | 10 +++++++--
- grub-core/normal/cmdline.c     | 14 ++++++++++--
- grub-core/normal/menu_entry.c  | 13 +++++++++--
- grub-core/script/argv.c        | 16 +++++++++++--
- grub-core/script/lexer.c       | 21 ++++++++++++++---
- grub-core/video/bitmap.c       | 25 +++++++++++++--------
- grub-core/video/readers/png.c  | 13 +++++++++--
- 23 files changed, 382 insertions(+), 113 deletions(-)
-
-diff --git a/grub-core/commands/legacycfg.c b/grub-

core/commands/legacycfg.c

(quoted diff) +0 -63
-index 5e3ec0d..cc5971f 100644
---- a/grub-core/commands/legacycfg.c
-+++ b/grub-core/commands/legacycfg.c
-@@ -32,6 +32,7 @@
- #include <grub/auth.h>
- #include <grub/disk.h>
- #include <grub/partition.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -104,13 +105,22 @@ legacy_file (const char *filename)
-     if (newsuffix)
-       {
-         char *t;
--
-+        grub_size_t sz;
-+
-+        if (grub_add (grub_strlen (suffix), grub_strlen (newsuffix), &sz) ||
-+            grub_add (sz, 1, &sz))
-+          {
-+            grub_errno = GRUB_ERR_OUT_OF_RANGE;
-+            goto fail_0;
-+          }
-+
-         t = suffix;
--        suffix = grub_realloc (suffix, grub_strlen (suffix)
--                               + grub_strlen (newsuffix) + 1);
-+        suffix = grub_realloc (suffix, sz);
-         if (!suffix)
-           {
-             grub_free (t);
-+
-+ fail_0:
-             grub_free (entrysrc);
-             grub_free (parsed);
-             grub_free (newsuffix);
-@@ -154,13 +164,22 @@ legacy_file (const char *filename)
-       else
-         {
-           char *t;
-+          grub_size_t sz;
-+
-+          if (grub_add (grub_strlen (entrysrc), grub_strlen (parsed), &sz) ||
-+              grub_add (sz, 1, &sz))
-+            {
-+              grub_errno = GRUB_ERR_OUT_OF_RANGE;
-+              goto fail_1;
-+            }
-
-           t = entrysrc;
--          entrysrc = grub_realloc (entrysrc, grub_strlen (entrysrc)
--                                   + grub_strlen (parsed) + 1);
-+          entrysrc = grub_realloc (entrysrc, sz);
-           if (!entrysrc)
-             {
-               grub_free (t);
-+
-+ fail_1:
-               grub_free (parsed);
-               grub_free (suffix);
-               return grub_errno;
-diff --git a/grub-core/commands/wildcard.c b/grub-

core/commands/wildcard.c

(quoted diff) +0 -34
-index 4a106ca..cc32903 100644
---- a/grub-core/commands/wildcard.c
-+++ b/grub-core/commands/wildcard.c
-@@ -23,6 +23,7 @@
- #include <grub/file.h>
- #include <grub/device.h>
- #include <grub/script_sh.h>
-+#include <grub/safemath.h>
-
- #include <regex.h>
-
-@@ -48,6 +49,7 @@ merge (char **dest, char **ps)
-   int i;
-   int j;
-   char **p;
-+  grub_size_t sz;
-
-   if (! dest)
-     return ps;
-@@ -60,7 +62,12 @@ merge (char **dest, char **ps)
-   for (j = 0; ps[j]; j++)
-     ;
-
--  p = grub_realloc (dest, sizeof (char*) * (i + j + 1));
-+  if (grub_add (i, j, &sz) ||
-+      grub_add (sz, 1, &sz) ||
-+      grub_mul (sz, sizeof (char *), &sz))
-+    return dest;
-+
-+  p = grub_realloc (dest, sz);
-   if (! p)
-     {
-       grub_free (dest);
-@@ -115,8 +122,15 @@ make_regex (const char *start, const char *end,

regex_t *regexp)

(quoted diff) +0 -25
-   char ch;
-   int i = 0;
-   unsigned len = end - start;
--  char *buffer = grub_malloc (len * 2 + 2 + 1); /* worst case size. */
-+  char *buffer;
-+  grub_size_t sz;
-
-+  /* Worst case size is (len * 2 + 2 + 1). */
-+  if (grub_mul (len, 2, &sz) ||
-+      grub_add (sz, 3, &sz))
-+    return 1;
-+
-+  buffer = grub_malloc (sz);
-   if (! buffer)
-     return 1;
-
-@@ -226,6 +240,7 @@ match_devices_iter (const char *name, void *data)
-   struct match_devices_ctx *ctx = data;
-   char **t;
-   char *buffer;
-+  grub_size_t sz;
-
-   /* skip partitions if asked to. */
-   if (ctx->noparts && grub_strchr (name, ','))
-@@ -239,11 +254,16 @@ match_devices_iter (const char *name, void

*data)

(quoted diff) +0 -88
-   if (regexec (ctx->regexp, buffer, 0, 0, 0))
-     {
-       grub_dprintf ("expand", "not matched\n");
-+ fail:
-       grub_free (buffer);
-       return 0;
-     }
-
--  t = grub_realloc (ctx->devs, sizeof (char*) * (ctx->ndev + 2));
-+  if (grub_add (ctx->ndev, 2, &sz) ||
-+      grub_mul (sz, sizeof (char *), &sz))
-+    goto fail;
-+
-+  t = grub_realloc (ctx->devs, sz);
-   if (! t)
-     {
-       grub_free (buffer);
-@@ -300,6 +320,7 @@ match_files_iter (const char *name,
-   struct match_files_ctx *ctx = data;
-   char **t;
-   char *buffer;
-+  grub_size_t sz;
-
-   /* skip . and .. names */
-   if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0)
-@@ -315,9 +336,14 @@ match_files_iter (const char *name,
-   if (! buffer)
-     return 1;
-
--  t = grub_realloc (ctx->files, sizeof (char*) * (ctx->nfile + 2));
--  if (! t)
-+  if (grub_add (ctx->nfile, 2, &sz) ||
-+      grub_mul (sz, sizeof (char *), &sz))
-+    goto fail;
-+
-+  t = grub_realloc (ctx->files, sz);
-+  if (!t)
-     {
-+ fail:
-       grub_free (buffer);
-       return 1;
-     }
-diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index e632370..58f8a53 100644
---- a/grub-core/disk/ldm.c
-+++ b/grub-core/disk/ldm.c
-@@ -25,6 +25,7 @@
- #include <grub/msdos_partition.h>
- #include <grub/gpt_partition.h>
- #include <grub/i18n.h>
-+#include <grub/safemath.h>
-
- #ifdef GRUB_UTIL
- #include <grub/emu/misc.h>
-@@ -289,6 +290,7 @@ make_vg (grub_disk_t disk,
-       struct grub_ldm_vblk vblk[GRUB_DISK_SECTOR_SIZE
-                             / sizeof (struct grub_ldm_vblk)];
-       unsigned i;
-+      grub_size_t sz;
-       err = grub_disk_read (disk, cursec, 0,
-                         sizeof(vblk), &vblk);
-       if (err)
-@@ -350,7 +352,13 @@ make_vg (grub_disk_t disk,
-           grub_free (lv);
-           goto fail2;
-         }
--      lv->name = grub_malloc (*ptr + 1);
-+      if (grub_add (*ptr, 1, &sz))
-+        {
-+          grub_free (lv->internal_id);
-+          grub_free (lv);
-+          goto fail2;
-+        }
-+      lv->name = grub_malloc (sz);
-       if (!lv->name)
-         {
-           grub_free (lv->internal_id);
-@@ -599,10 +607,13 @@ make_vg (grub_disk_t disk,
-       if (lv->segments->node_alloc == lv->segments->node_count)
-         {
-           void *t;
--          lv->segments->node_alloc *= 2;
--          t = grub_realloc (lv->segments->nodes,
--                            sizeof (*lv->segments->nodes)
--                            * lv->segments->node_alloc);
-+          grub_size_t sz;
-+
-+          if (grub_mul (lv->segments->node_alloc, 2, &lv->segments-
Quoted 1 line

node_alloc) ||

-+ grub_mul (lv->segments->node_alloc, sizeof (*lv-

Quoted 1 line

segments->nodes), &sz))

-+ goto fail2;
-+
-+ t = grub_realloc (lv->segments->nodes, sz);

(quoted diff) +0 -14
-           if (!t)
-             goto fail2;
-           lv->segments->nodes = t;
-@@ -723,10 +734,13 @@ make_vg (grub_disk_t disk,
-           if (comp->segment_alloc == comp->segment_count)
-             {
-               void *t;
--              comp->segment_alloc *= 2;
--              t = grub_realloc (comp->segments,
--                                comp->segment_alloc
--                                * sizeof (*comp->segments));
-+              grub_size_t sz;
-+
-+              if (grub_mul (comp->segment_alloc, 2, &comp-
Quoted 1 line

segment_alloc) ||

-+ grub_mul (comp->segment_alloc, sizeof (*comp-

Quoted 1 line

segments), &sz))

-+ goto fail2;
-+
-+ t = grub_realloc (comp->segments, sz);

(quoted diff) +0 -60
-               if (!t)
-                 goto fail2;
-               comp->segments = t;
-diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 8e118b3..5edb477 100644
---- a/grub-core/font/font.c
-+++ b/grub-core/font/font.c
-@@ -30,6 +30,7 @@
- #include <grub/unicode.h>
- #include <grub/fontformat.h>
- #include <grub/env.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -360,9 +361,13 @@ static char *
- read_section_as_string (struct font_file_section *section)
- {
-   char *str;
-+  grub_size_t sz;
-   grub_ssize_t ret;
-
--  str = grub_malloc (section->length + 1);
-+  if (grub_add (section->length, 1, &sz))
-+    return NULL;
-+
-+  str = grub_malloc (sz);
-   if (!str)
-     return 0;
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 11272ef..2b65bd5 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -40,6 +40,7 @@
- #include <grub/btrfs.h>
- #include <grub/crypto.h>
- #include <grub/diskfilter.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -329,9 +330,13 @@ save_ref (struct grub_btrfs_leaf_descriptor *desc,
-   if (desc->allocated < desc->depth)
-     {
-       void *newdata;
--      desc->allocated *= 2;
--      newdata = grub_realloc (desc->data, sizeof (desc->data[0])
--                          * desc->allocated);
-+      grub_size_t sz;
-+
-+      if (grub_mul (desc->allocated, 2, &desc->allocated) ||
-+      grub_mul (desc->allocated, sizeof (desc->data[0]), &sz))
-+    return GRUB_ERR_OUT_OF_RANGE;
-+
-+      newdata = grub_realloc (desc->data, sz);
-       if (!newdata)
-     return grub_errno;
-       desc->data = newdata;
-@@ -622,16 +627,21 @@ find_device (struct grub_btrfs_data *data,

grub_uint64_t id)

(quoted diff) +0 -11
-   if (data->n_devices_attached > data->n_devices_allocated)
-     {
-       void *tmp;
--      data->n_devices_allocated = 2 * data->n_devices_attached + 1;
--      data->devices_attached
--    = grub_realloc (tmp = data->devices_attached,
--                    data->n_devices_allocated
--                    * sizeof (data->devices_attached[0]));
-+      grub_size_t sz;
-+
-+      if (grub_mul (data->n_devices_attached, 2, &data-
Quoted 1 line

n_devices_allocated) ||

-+ grub_add (data->n_devices_allocated, 1, &data-

Quoted 1 line

n_devices_allocated) ||

-+ grub_mul (data->n_devices_allocated, sizeof (data-

Quoted 1 line

devices_attached[0]), &sz))

-+ goto fail;
-+
-+ data->devices_attached = grub_realloc (tmp = data->devices_attached,
sz);

(quoted diff) +0 -24
-       if (!data->devices_attached)
-     {
-+      data->devices_attached = tmp;
-+
-+ fail:
-       if (ctx.dev_found)
-         grub_device_close (ctx.dev_found);
--      data->devices_attached = tmp;
-       return NULL;
-     }
-     }
-diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index 9b38980..ac33bcd 100644
---- a/grub-core/fs/ext2.c
-+++ b/grub-core/fs/ext2.c
-@@ -46,6 +46,7 @@
- #include <grub/dl.h>
- #include <grub/types.h>
- #include <grub/fshelp.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -703,6 +704,7 @@ grub_ext2_read_symlink (grub_fshelp_node_t

node)
- {

(quoted diff) +0 -7
-   char *symlink;
-   struct grub_fshelp_node *diro = node;
-+  grub_size_t sz;
-
-   if (! diro->inode_read)
-     {
-@@ -717,7 +719,13 @@ grub_ext2_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -42
-        }
-     }
-
--  symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1);
-+  if (grub_add (grub_le_to_cpu32 (diro->inode.size), 1, &sz))
-+    {
-+      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-+      return NULL;
-+    }
-+
-+  symlink = grub_malloc (sz);
-   if (! symlink)
-     return 0;
-
-diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 4f1b52a..7ba5b30 100644
---- a/grub-core/fs/iso9660.c
-+++ b/grub-core/fs/iso9660.c
-@@ -28,6 +28,7 @@
- #include <grub/fshelp.h>
- #include <grub/charset.h>
- #include <grub/datetime.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -531,8 +532,13 @@ add_part (struct iterate_dir_ctx *ctx,
-       int len2)
- {
-   int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0;
-+  grub_size_t sz;
-
--  ctx->symlink = grub_realloc (ctx->symlink, size + len2 + 1);
-+  if (grub_add (size, len2, &sz) ||
-+      grub_add (sz, 1, &sz))
-+    return;
-+
-+  ctx->symlink = grub_realloc (ctx->symlink, sz);
-   if (! ctx->symlink)
-     return;
-
-@@ -560,17 +566,24 @@ susp_iterate_dir (struct grub_iso9660_susp_entry

*entry,

(quoted diff) +0 -27
-     {
-       grub_size_t off = 0, csize = 1;
-       char *old;
-+      grub_size_t sz;
-+
-       csize = entry->len - 5;
-       old = ctx->filename;
-       if (ctx->filename_alloc)
-         {
-           off = grub_strlen (ctx->filename);
--          ctx->filename = grub_realloc (ctx->filename, csize + off + 1);
-+          if (grub_add (csize, off, &sz) ||
-+              grub_add (sz, 1, &sz))
-+            return GRUB_ERR_OUT_OF_RANGE;
-+          ctx->filename = grub_realloc (ctx->filename, sz);
-         }
-       else
-         {
-           off = 0;
--          ctx->filename = grub_zalloc (csize + 1);
-+          if (grub_add (csize, 1, &sz))
-+            return GRUB_ERR_OUT_OF_RANGE;
-+          ctx->filename = grub_zalloc (sz);
-         }
-       if (!ctx->filename)
-         {
-@@ -776,14 +789,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t

dir,

(quoted diff) +0 -12
-         if (node->have_dirents >= node->alloc_dirents)
-           {
-             struct grub_fshelp_node *new_node;
--            node->alloc_dirents *= 2;
--            new_node = grub_realloc (node,
--                                     sizeof (struct grub_fshelp_node)
--                                     + ((node->alloc_dirents
--                                         - ARRAY_SIZE (node->dirents))
--                                        * sizeof (node->dirents[0])));
-+            grub_size_t sz;
-+
-+            if (grub_mul (node->alloc_dirents, 2, &node->alloc_dirents)
||
-+                grub_sub (node->alloc_dirents, ARRAY_SIZE (node-
>dirents), &sz) ||
-+                grub_mul (sz, sizeof (node->dirents[0]), &sz) ||
-+                grub_add (sz, sizeof (struct grub_fshelp_node), &sz))
-+              goto fail_0;

-+
-+ new_node = grub_realloc (node, sz);

(quoted diff) +0 -7
-             if (!new_node)
-               {
-+ fail_0:
-                 if (ctx.filename_alloc)
-                   grub_free (ctx.filename);
-                 grub_free (node);
-@@ -799,14 +816,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t

dir,

(quoted diff) +0 -12
-             * sizeof (node->dirents[0]) < grub_strlen (ctx.symlink) + 1)
-           {
-             struct grub_fshelp_node *new_node;
--            new_node = grub_realloc (node,
--                                     sizeof (struct grub_fshelp_node)
--                                     + ((node->alloc_dirents
--                                         - ARRAY_SIZE (node->dirents))
--                                        * sizeof (node->dirents[0]))
--                                     + grub_strlen (ctx.symlink) + 1);
-+            grub_size_t sz;
-+
-+            if (grub_sub (node->alloc_dirents, ARRAY_SIZE (node-
Quoted 1 line

dirents), &sz) ||

-+                grub_mul (sz, sizeof (node->dirents[0]), &sz) ||
-+                grub_add (sz, sizeof (struct grub_fshelp_node) + 1, &sz) ||
-+                grub_add (sz, grub_strlen (ctx.symlink), &sz))

-+ goto fail_1;
-+
-+ new_node = grub_realloc (node, sz);

(quoted diff) +0 -19
-             if (!new_node)
-               {
-+ fail_1:
-                 if (ctx.filename_alloc)
-                   grub_free (ctx.filename);
-                 grub_free (node);
-diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 90f7fb3..de2b107 100644
---- a/grub-core/fs/sfs.c
-+++ b/grub-core/fs/sfs.c
-@@ -26,6 +26,7 @@
- #include <grub/types.h>
- #include <grub/fshelp.h>
- #include <grub/charset.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -307,10 +308,15 @@ grub_sfs_read_block (grub_fshelp_node_t node,

grub_disk_addr_t fileblock)

(quoted diff) +0 -18
-       if (node->cache && node->cache_size >= node->cache_allocated)
-     {
-       struct cache_entry *e = node->cache;
--      e = grub_realloc (node->cache,node->cache_allocated * 2
--                        * sizeof (e[0]));
-+      grub_size_t sz;
-+
-+      if (grub_mul (node->cache_allocated, 2 * sizeof (e[0]), &sz))
-+        goto fail;
-+
-+      e = grub_realloc (node->cache, sz);
-       if (!e)
-         {
-+ fail:
-           grub_errno = 0;
-           grub_free (node->cache);
-           node->cache = 0;
-@@ -477,10 +483,16 @@ grub_sfs_create_node (struct grub_fshelp_node

**node,

(quoted diff) +0 -46
-   grub_size_t len = grub_strlen (name);
-   grub_uint8_t *name_u8;
-   int ret;
-+  grub_size_t sz;
-+
-+  if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) ||
-+      grub_add (sz, 1, &sz))
-+    return 1;
-+
-   *node = grub_malloc (sizeof (**node));
-   if (!*node)
-     return 1;
--  name_u8 = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1);
-+  name_u8 = grub_malloc (sz);
-   if (!name_u8)
-     {
-       grub_free (*node);
-@@ -724,8 +736,13 @@ grub_sfs_label (grub_device_t device, char **label)
-   data = grub_sfs_mount (disk);
-   if (data)
-     {
--      grub_size_t len = grub_strlen (data->label);
--      *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1);
-+      grub_size_t sz, len = grub_strlen (data->label);
-+
-+      if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) ||
-+      grub_add (sz, 1, &sz))
-+    return GRUB_ERR_OUT_OF_RANGE;
-+
-+      *label = grub_malloc (sz);
-       if (*label)
-     *grub_latin1_to_utf8 ((grub_uint8_t *) *label,
-                           (const grub_uint8_t *) data->label,
-diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
-index 95d5c1e..7851238 100644
---- a/grub-core/fs/squash4.c
-+++ b/grub-core/fs/squash4.c
-@@ -26,6 +26,7 @@
- #include <grub/types.h>
- #include <grub/fshelp.h>
- #include <grub/deflate.h>
-+#include <grub/safemath.h>
- #include <minilzo.h>
-
- #include "xz.h"
-@@ -459,7 +460,17 @@ grub_squash_read_symlink (grub_fshelp_node_t

node)
- {

(quoted diff) +0 -42
-   char *ret;
-   grub_err_t err;
--  ret = grub_malloc (grub_le_to_cpu32 (node->ino.symlink.namelen) + 1);
-+  grub_size_t sz;
-+
-+  if (grub_add (grub_le_to_cpu32 (node->ino.symlink.namelen), 1, &sz))
-+    {
-+      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-+      return NULL;
-+    }
-+
-+  ret = grub_malloc (sz);
-+  if (!ret)
-+    return NULL;
-
-   err = read_chunk (node->data, ret,
-                 grub_le_to_cpu32 (node->ino.symlink.namelen),
-@@ -506,11 +517,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
-
-   {
-     grub_fshelp_node_t node;
--    node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir->stack[0]));
-+    grub_size_t sz;
-+
-+    if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) ||
-+    grub_add (sz, sizeof (*node), &sz))
-+      return 0;
-+
-+    node = grub_malloc (sz);
-     if (!node)
-       return 0;
--    grub_memcpy (node, dir,
--             sizeof (*node) + dir->stsize * sizeof (dir->stack[0]));
-+    grub_memcpy (node, dir, sz);
-     if (hook (".", GRUB_FSHELP_DIR, node, hook_data))
-       return 1;
-
-@@ -518,12 +534,15 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
-       {
-     grub_err_t err;
-
--    node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir-
Quoted 1 line

stack[0]));

-+ if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) ||
-+ grub_add (sz, sizeof (*node), &sz))
-+ return 0;
-+
-+ node = grub_malloc (sz);

(quoted diff) +0 -38
-     if (!node)
-       return 0;
-
--    grub_memcpy (node, dir,
--                 sizeof (*node) + dir->stsize * sizeof (dir->stack[0]));
-+    grub_memcpy (node, dir, sz);
-
-     node->stsize--;
-     err = read_chunk (dir->data, &node->ino, sizeof (node->ino),
-@@ -557,6 +576,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
-       enum grub_fshelp_filetype filetype = GRUB_FSHELP_REG;
-       struct grub_squash_dirent di;
-       struct grub_squash_inode ino;
-+      grub_size_t sz;
-
-       err = read_chunk (dir->data, &di, sizeof (di),
-                         grub_le_to_cpu64 (dir->data->sb.diroffset)
-@@ -589,13 +609,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
-       if (grub_le_to_cpu16 (di.type) == SQUASH_TYPE_SYMLINK)
-         filetype = GRUB_FSHELP_SYMLINK;
-
--      node = grub_malloc (sizeof (*node)
--                          + (dir->stsize + 1) * sizeof (dir->stack[0]));
-+      if (grub_add (dir->stsize, 1, &sz) ||
-+          grub_mul (sz, sizeof (dir->stack[0]), &sz) ||
-+          grub_add (sz, sizeof (*node), &sz))
-+        return 0;
-+
-+      node = grub_malloc (sz);
-       if (! node)
-         return 0;
-
--      grub_memcpy (node, dir,
--                   sizeof (*node) + dir->stsize * sizeof (dir->stack[0]));
-+      grub_memcpy (node, dir, sz - sizeof(dir->stack[0]));
-
-       node->ino = ino;
-       node->stack[node->stsize].ino_chunk = grub_le_to_cpu32

(dh.ino_chunk);

(quoted diff) +0 -13
-diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index a837616..21ac7f4 100644
---- a/grub-core/fs/udf.c
-+++ b/grub-core/fs/udf.c
-@@ -28,6 +28,7 @@
- #include <grub/charset.h>
- #include <grub/datetime.h>
- #include <grub/udf.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -890,9 +891,19 @@ read_string (const grub_uint8_t *raw, grub_size_t

sz, char *outbuf)

(quoted diff) +0 -21
-     utf16[i] = (raw[2 * i + 1] << 8) | raw[2*i + 2];
-     }
-   if (!outbuf)
--    outbuf = grub_malloc (utf16len * GRUB_MAX_UTF8_PER_UTF16 + 1);
-+    {
-+      grub_size_t size;
-+
-+      if (grub_mul (utf16len, GRUB_MAX_UTF8_PER_UTF16, &size) ||
-+      grub_add (size, 1, &size))
-+    goto fail;
-+
-+      outbuf = grub_malloc (size);
-+    }
-   if (outbuf)
-     *grub_utf16_to_utf8 ((grub_uint8_t *) outbuf, utf16, utf16len) = '\0';
-+
-+ fail:
-   grub_free (utf16);
-   return outbuf;
- }
-@@ -1005,7 +1016,7 @@ grub_udf_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -9
-   grub_size_t sz = U64 (node->block.fe.file_size);
-   grub_uint8_t *raw;
-   const grub_uint8_t *ptr;
--  char *out, *optr;
-+  char *out = NULL, *optr;
-
-   if (sz < 4)
-     return NULL;
-@@ -1013,14 +1024,16 @@ grub_udf_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -22
-   if (!raw)
-     return NULL;
-   if (grub_udf_read_file (node, NULL, NULL, 0, sz, (char *) raw) < 0)
--    {
--      grub_free (raw);
--      return NULL;
--    }
-+    goto fail_1;
-
--  out = grub_malloc (sz * 2 + 1);
-+  if (grub_mul (sz, 2, &sz) ||
-+      grub_add (sz, 1, &sz))
-+    goto fail_0;
-+
-+  out = grub_malloc (sz);
-   if (!out)
-     {
-+ fail_0:
-       grub_free (raw);
-       return NULL;
-     }
-@@ -1031,17 +1044,17 @@ grub_udf_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -22
-     {
-       grub_size_t s;
-       if ((grub_size_t) (ptr - raw + 4) > sz)
--    goto fail;
-+    goto fail_1;
-       if (!(ptr[2] == 0 && ptr[3] == 0))
--    goto fail;
-+    goto fail_1;
-       s = 4 + ptr[1];
-       if ((grub_size_t) (ptr - raw + s) > sz)
--    goto fail;
-+    goto fail_1;
-       switch (*ptr)
-     {
-     case 1:
-       if (ptr[1])
--        goto fail;
-+        goto fail_1;
-       /* Fallthrough.  */
-     case 2:
-       /* in 4 bytes. out: 1 byte.  */
-@@ -1066,11 +1079,11 @@ grub_udf_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -14
-       if (optr != out)
-         *optr++ = '/';
-       if (!read_string (ptr + 4, s - 4, optr))
--        goto fail;
-+        goto fail_1;
-       optr += grub_strlen (optr);
-       break;
-     default:
--      goto fail;
-+      goto fail_1;
-     }
-       ptr += s;
-     }
-@@ -1078,7 +1091,7 @@ grub_udf_read_symlink (grub_fshelp_node_t

node)

(quoted diff) +0 -68
-   grub_free (raw);
-   return out;
-
-- fail:
-+ fail_1:
-   grub_free (raw);
-   grub_free (out);
-   grub_error (GRUB_ERR_BAD_FS, "invalid symlink");
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 96ffecb..ea65902 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -25,6 +25,7 @@
- #include <grub/dl.h>
- #include <grub/types.h>
- #include <grub/fshelp.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -899,6 +900,7 @@ static struct grub_xfs_data *
- grub_xfs_mount (grub_disk_t disk)
- {
-   struct grub_xfs_data *data = 0;
-+  grub_size_t sz;
-
-   data = grub_zalloc (sizeof (struct grub_xfs_data));
-   if (!data)
-@@ -913,10 +915,11 @@ grub_xfs_mount (grub_disk_t disk)
-   if (!grub_xfs_sb_valid(data))
-     goto fail;
-
--  data = grub_realloc (data,
--                   sizeof (struct grub_xfs_data)
--                   - sizeof (struct grub_xfs_inode)
--                   + grub_xfs_inode_size(data) + 1);
-+  if (grub_add (grub_xfs_inode_size (data),
-+      sizeof (struct grub_xfs_data) - sizeof (struct grub_xfs_inode) + 1, &sz))
-+    goto fail;
-+
-+  data = grub_realloc (data, sz);
-
-   if (! data)
-     goto fail;
-diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 381dde5..36d0373 100644
---- a/grub-core/fs/zfs/zfs.c
-+++ b/grub-core/fs/zfs/zfs.c
-@@ -55,6 +55,7 @@
- #include <grub/deflate.h>
- #include <grub/crypto.h>
- #include <grub/i18n.h>
-+#include <grub/safemath.h>
-
- GRUB_MOD_LICENSE ("GPLv3+");
-
-@@ -773,11 +774,14 @@ fill_vdev_info (struct grub_zfs_data *data,
-   if (data->n_devices_attached > data->n_devices_allocated)
-     {
-       void *tmp;
--      data->n_devices_allocated = 2 * data->n_devices_attached + 1;
--      data->devices_attached
--    = grub_realloc (tmp = data->devices_attached,
--                    data->n_devices_allocated
--                    * sizeof (data->devices_attached[0]));
-+      grub_size_t sz;
-+
-+      if (grub_mul (data->n_devices_attached, 2, &data-
Quoted 1 line

n_devices_allocated) ||

-+ grub_add (data->n_devices_allocated, 1, &data-

Quoted 1 line

n_devices_allocated) ||

-+ grub_mul (data->n_devices_allocated, sizeof (data-

Quoted 1 line

devices_attached[0]), &sz))

-+ return GRUB_ERR_OUT_OF_RANGE;
-+
-+ data->devices_attached = grub_realloc (tmp = data->devices_attached,
sz);

(quoted diff) +0 -4
-       if (!data->devices_attached)
-     {
-       data->devices_attached = tmp;
-@@ -3468,14 +3472,18 @@ grub_zfs_nvlist_lookup_nvlist (const char

*nvlist, const char *name)
- {

(quoted diff) +0 -68
-   char *nvpair;
-   char *ret;
--  grub_size_t size;
-+  grub_size_t size, sz;
-   int found;
-
-   found = nvlist_find_value (nvlist, name, DATA_TYPE_NVLIST, &nvpair,
-                          &size, 0);
-   if (!found)
-     return 0;
--  ret = grub_zalloc (size + 3 * sizeof (grub_uint32_t));
-+
-+  if (grub_add (size, 3 * sizeof (grub_uint32_t), &sz))
-+      return 0;
-+
-+  ret = grub_zalloc (sz);
-   if (!ret)
-     return 0;
-   grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));
-diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
-index 1402e0b..de3b015 100644
---- a/grub-core/fs/zfs/zfscrypt.c
-+++ b/grub-core/fs/zfs/zfscrypt.c
-@@ -22,6 +22,7 @@
- #include <grub/misc.h>
- #include <grub/disk.h>
- #include <grub/partition.h>
-+#include <grub/safemath.h>
- #include <grub/dl.h>
- #include <grub/types.h>
- #include <grub/zfs/zfs.h>
-@@ -82,9 +83,13 @@ grub_zfs_add_key (grub_uint8_t *key_in,
-               int passphrase)
- {
-   struct grub_zfs_wrap_key *key;
-+  grub_size_t sz;
-+
-   if (!passphrase && keylen > 32)
-     keylen = 32;
--  key = grub_malloc (sizeof (*key) + keylen);
-+  if (grub_add (sizeof (*key), keylen, &sz))
-+    return GRUB_ERR_OUT_OF_RANGE;
-+  key = grub_malloc (sz);
-   if (!key)
-     return grub_errno;
-   key->is_passphrase = passphrase;
-diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
-index fd7744a..3288609 100644
---- a/grub-core/lib/arg.c
-+++ b/grub-core/lib/arg.c
-@@ -23,6 +23,7 @@
- #include <grub/term.h>
- #include <grub/extcmd.h>
- #include <grub/i18n.h>
-+#include <grub/safemath.h>
-
- /* Built-in parser for default options.  */
- static const struct grub_arg_option help_options[] =
-@@ -216,7 +217,13 @@ static inline grub_err_t
- add_arg (char ***argl, int *num, char *s)
- {
-   char **p = *argl;
--  *argl = grub_realloc (*argl, (++(*num) + 1) * sizeof (char *));
-+  grub_size_t sz;
-+
-+  if (grub_add (++(*num), 1, &sz) ||
-+      grub_mul (sz, sizeof (char *), &sz))
-+    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is

detected"));
-+
-+ *argl = grub_realloc (*argl, sz);

(quoted diff) +0 -12
-   if (! *argl)
-     {
-       grub_free (p);
-@@ -431,6 +438,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
-   grub_size_t argcnt;
-   struct grub_arg_list *list;
-   const struct grub_arg_option *options;
-+  grub_size_t sz0, sz1;
-
-   options = extcmd->options;
-   if (! options)
-@@ -443,7 +451,15 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int

argc,
- argcnt += ((grub_size_t) argc + 1) / 2 + 1; /* max possible for any
option */

(quoted diff) +0 -58
-     }
-
--  list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt);
-+  if (grub_mul (sizeof (*list), i, &sz0) ||
-+      grub_mul (sizeof (char *), argcnt, &sz1) ||
-+      grub_add (sz0, sz1, &sz0))
-+    {
-+      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-+      return 0;
-+    }
-+
-+  list = grub_zalloc (sz0);
-   if (! list)
-     return 0;
-
-diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 3730ed3..b92cbe9 100644
---- a/grub-core/loader/i386/bsd.c
-+++ b/grub-core/loader/i386/bsd.c
-@@ -35,6 +35,7 @@
- #include <grub/ns8250.h>
- #include <grub/bsdlabel.h>
- #include <grub/crypto.h>
-+#include <grub/safemath.h>
- #include <grub/verify.h>
- #ifdef GRUB_MACHINE_PCBIOS
- #include <grub/machine/int.h>
-@@ -1012,11 +1013,16 @@ grub_netbsd_add_modules (void)
-   struct grub_netbsd_btinfo_modules *mods;
-   unsigned i;
-   grub_err_t err;
-+  grub_size_t sz;
-
-   for (mod = netbsd_mods; mod; mod = mod->next)
-     modcnt++;
-
--  mods = grub_malloc (sizeof (*mods) + sizeof (mods->mods[0]) * modcnt);
-+  if (grub_mul (modcnt, sizeof (mods->mods[0]), &sz) ||
-+      grub_add (sz, sizeof (*mods), &sz))
-+    return GRUB_ERR_OUT_OF_RANGE;
-+
-+  mods = grub_malloc (sz);
-   if (!mods)
-     return grub_errno;
-
-diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index e332d5e..906ec7d 100644
---- a/grub-core/net/dns.c
-+++ b/grub-core/net/dns.c
-@@ -22,6 +22,7 @@
- #include <grub/i18n.h>
- #include <grub/err.h>
- #include <grub/time.h>
-+#include <grub/safemath.h>
-
- struct dns_cache_element
- {
-@@ -51,9 +52,15 @@ grub_net_add_dns_server (const struct

grub_net_network_level_address *s)

(quoted diff) +0 -29
-     {
-       int na = dns_servers_alloc * 2;
-       struct grub_net_network_level_address *ns;
-+      grub_size_t sz;
-+
-       if (na < 8)
-     na = 8;
--      ns = grub_realloc (dns_servers, na * sizeof (ns[0]));
-+
-+      if (grub_mul (na, sizeof (ns[0]), &sz))
-+    return GRUB_ERR_OUT_OF_RANGE;
-+
-+      ns = grub_realloc (dns_servers, sz);
-       if (!ns)
-     return grub_errno;
-       dns_servers_alloc = na;
-diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index d57fb72..4dfcc31 100644
---- a/grub-core/normal/charset.c
-+++ b/grub-core/normal/charset.c
-@@ -48,6 +48,7 @@
- #include <grub/unicode.h>
- #include <grub/term.h>
- #include <grub/normal.h>
-+#include <grub/safemath.h>
-
- #if HAVE_FONT_SOURCE
- #include "widthspec.h"
-@@ -464,6 +465,7 @@ grub_unicode_aglomerate_comb (const

grub_uint32_t *in, grub_size_t inlen,

(quoted diff) +0 -8
-     {
-       struct grub_unicode_combining *n;
-       unsigned j;
-+      grub_size_t sz;
-
-       if (!haveout)
-         continue;
-@@ -477,10 +479,14 @@ grub_unicode_aglomerate_comb (const

grub_uint32_t *in, grub_size_t inlen,

(quoted diff) +0 -29
-         n = out->combining_inline;
-       else if (out->ncomb > (int) ARRAY_SIZE (out->combining_inline))
-         {
--          n = grub_realloc (out->combining_ptr,
--                            sizeof (n[0]) * (out->ncomb + 1));
-+          if (grub_add (out->ncomb, 1, &sz) ||
-+              grub_mul (sz, sizeof (n[0]), &sz))
-+            goto fail;
-+
-+          n = grub_realloc (out->combining_ptr, sz);
-           if (!n)
-             {
-+ fail:
-               grub_errno = GRUB_ERR_NONE;
-               continue;
-             }
-diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c57242e..de03fe6 100644
---- a/grub-core/normal/cmdline.c
-+++ b/grub-core/normal/cmdline.c
-@@ -28,6 +28,7 @@
- #include <grub/env.h>
- #include <grub/i18n.h>
- #include <grub/charset.h>
-+#include <grub/safemath.h>
-
- static grub_uint32_t *kill_buf;
-
-@@ -307,12 +308,21 @@ cl_insert (struct cmdline_term *cl_terms,

unsigned nterms,

(quoted diff) +0 -24
-   if (len + (*llen) >= (*max_len))
-     {
-       grub_uint32_t *nbuf;
--      (*max_len) *= 2;
--      nbuf = grub_realloc ((*buf), sizeof (grub_uint32_t) * (*max_len));
-+      grub_size_t sz;
-+
-+      if (grub_mul (*max_len, 2, max_len) ||
-+      grub_mul (*max_len, sizeof (grub_uint32_t), &sz))
-+    {
-+      grub_errno = GRUB_ERR_OUT_OF_RANGE;
-+      goto fail;
-+    }
-+
-+      nbuf = grub_realloc ((*buf), sz);
-       if (nbuf)
-     (*buf) = nbuf;
-       else
-     {
-+ fail:
-       grub_print_error ();
-       grub_errno = GRUB_ERR_NONE;
-       (*max_len) /= 2;
-diff --git a/grub-core/normal/menu_entry.c b/grub-

core/normal/menu_entry.c

(quoted diff) +0 -17
-index 1993995..50eef91 100644
---- a/grub-core/normal/menu_entry.c
-+++ b/grub-core/normal/menu_entry.c
-@@ -27,6 +27,7 @@
- #include <grub/auth.h>
- #include <grub/i18n.h>
- #include <grub/charset.h>
-+#include <grub/safemath.h>
-
- enum update_mode
-   {
-@@ -113,10 +114,18 @@ ensure_space (struct line *linep, int extra)
- {
-   if (linep->max_len < linep->len + extra)
-     {
--      linep->max_len = 2 * (linep->len + extra);
--      linep->buf = grub_realloc (linep->buf, (linep->max_len + 1) * sizeof

(linep->buf[0]));
-+ grub_size_t sz0, sz1;
-+

-+      if (grub_add (linep->len, extra, &sz0) ||
-+      grub_mul (sz0, 2, &sz0) ||
-+      grub_add (sz0, 1, &sz1) ||
-+      grub_mul (sz1, sizeof (linep->buf[0]), &sz1))

-+ return 0;
-+
-+ linep->buf = grub_realloc (linep->buf, sz1);

(quoted diff) +0 -37
-       if (! linep->buf)
-     return 0;
-+      linep->max_len = sz0;
-     }
-
-   return 1;
-diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
-index 217ec5d..5751fdd 100644
---- a/grub-core/script/argv.c
-+++ b/grub-core/script/argv.c
-@@ -20,6 +20,7 @@
- #include <grub/mm.h>
- #include <grub/misc.h>
- #include <grub/script_sh.h>
-+#include <grub/safemath.h>
-
- /* Return nearest power of two that is >= v.  */
- static unsigned
-@@ -81,11 +82,16 @@ int
- grub_script_argv_next (struct grub_script_argv *argv)
- {
-   char **p = argv->args;
-+  grub_size_t sz;
-
-   if (argv->args && argv->argc && argv->args[argv->argc - 1] == 0)
-     return 0;
-
--  p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *)));
-+  if (grub_add (argv->argc, 2, &sz) ||
-+      grub_mul (sz, sizeof (char *), &sz))
-+    return 1;
-+
-+  p = grub_realloc (p, round_up_exp (sz));
-   if (! p)
-     return 1;
-
-@@ -105,13 +111,19 @@ grub_script_argv_append (struct grub_script_argv

*argv, const char *s,
- {

(quoted diff) +0 -32
-   grub_size_t a;
-   char *p = argv->args[argv->argc - 1];
-+  grub_size_t sz;
-
-   if (! s)
-     return 0;
-
-   a = p ? grub_strlen (p) : 0;
-
--  p = grub_realloc (p, round_up_exp ((a + slen + 1) * sizeof (char)));
-+  if (grub_add (a, slen, &sz) ||
-+      grub_add (sz, 1, &sz) ||
-+      grub_mul (sz, sizeof (char), &sz))
-+    return 1;
-+
-+  p = grub_realloc (p, round_up_exp (sz));
-   if (! p)
-     return 1;
-
-diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
-index c6bd317..5fb0cbd 100644
---- a/grub-core/script/lexer.c
-+++ b/grub-core/script/lexer.c
-@@ -24,6 +24,7 @@
- #include <grub/mm.h>
- #include <grub/script_sh.h>
- #include <grub/i18n.h>
-+#include <grub/safemath.h>
-
- #define yytext_ptr char *
- #include "grub_script.tab.h"
-@@ -110,10 +111,14 @@ grub_script_lexer_record (struct

grub_parser_param *parser, char *str)

(quoted diff) +0 -25
-       old = lexer->recording;
-       if (lexer->recordlen < len)
-     lexer->recordlen = len;
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_parser_param *parserstate,

(quoted diff) +0 -36

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

**bitmap,

(quoted diff) +0 -9

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_video_bitmap **bitmap,

(quoted diff) +0 -34

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

core/video/readers/png.c

(quoted diff) +0 -12

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_png_data *data)

(quoted diff) +0 -7

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

detected"));
-+
- if (data->color_bits <= 4)
-- data->row_bytes = (data->image_width * data->color_bits + 7) / 8;
-+ {
-+ if (grub_mul (data->image_width, data->color_bits + 7, &data-

Quoted 1 line

row_bytes))

-+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is
detected"));
-+
-+ data->row_bytes >>= 3;
-+ }

(quoted diff) +0 -6

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

after-free-when-redefining-a-func.patch b/meta/recipes- bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after-free-when- redefining-a-func.patch
deleted file mode 100644
index 329e554a68..0000000000
--- a/meta/recipes-bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after- free-when-redefining-a-func.patch
+++ /dev/null

(quoted diff) +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

(quoted diff) +0 -3

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

function
- during execution

(quoted diff) +0 -24

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

https://git.savannah.gnu.org/cgit/grub.git/commit/?id=426f57383d647406ae
9c628c472059c27cd6e040

(quoted diff) +0 -14

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

func, int argc, char **args)

(quoted diff) +0 -14

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

*functionname_arg,

(quoted diff) +0 -8

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

*functionname_arg,

(quoted diff) +0 -52

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

overflows-in-initrd-size-handling.patch b/meta/recipes-bsp/grub/files/CVE- 2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch deleted file mode 100644
index d4f9300c0a..0000000000
--- a/meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-integer- overflows-in-initrd-size-handling.patch
+++ /dev/null

(quoted diff) +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

(quoted diff) +0 -17

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

https://git.savannah.gnu.org/cgit/grub.git/commit/?id=e7b8856f8be3292afd
b38d2e8c70ad8d62a61e10

(quoted diff) +1 -47

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

detected"));

-+          grub_free (n->name);
-+          grub_free (n);
-+          return grub_errno;

-+ }

(quoted diff) +0 -21

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

0,
-+ &dir_size))

(quoted diff) +0 -7

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Quoted 1 line

components[i].newc_name),

-- 4);
-- initrd_ctx->size += insert_dir (initrd_ctx-

Quoted 1 line

components[i].newc_name,

-- &root, 0);
-+ name_len = grub_strlen (initrd_ctx-

Quoted 1 line

components[i].newc_name);

-+ if (grub_add (initrd_ctx->size,
-+ ALIGN_UP (sizeof (struct newc_head) + name_len,
4),
-+ &initrd_ctx->size) ||
-+ grub_add (initrd_ctx->size, dir_size, &initrd_ctx->size))
-+ goto overflow;

(quoted diff) +0 -46

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

detected"));
- }
-
- grub_size_t
-@@ -261,8 +287,16 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,

(quoted diff) +0 -17

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Quoted 1 line

components[i].newc_name),

(quoted diff) +0 -4

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -1
index faa7fde232..1323a54a59 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +1 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +4 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

'./build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub- core/lib/libgcrypt/src/global.c' ! -ipath './grub- core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! - ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub- core/lib/gnulib/*' |sort > po/POTFILES.in
-+find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub- core/lib/libgcrypt/src/global.c' ! -ipath './grub- core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! - ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub- core/lib/gnulib/*' ! -path './.pc/*' |sort > po/POTFILES.in
+-find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub- core/lib/libgcrypt/src/global.c' ! -ipath './grub- core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! - ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -ipath './grub- core/lib/gnulib/*' |sort > po/POTFILES.in
++find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub- core/lib/libgcrypt/src/global.c' ! -ipath './grub- core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! - ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -ipath './grub- core/lib/gnulib/*' ! -path './.pc/*' |sort > po/POTFILES.in
find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in

echo "Importing unicode..."
--
-2.7.4
+2.17.1

(quoted diff) +0 -0

an-overflow-checking.patch b/meta/recipes-bsp/grub/files/calloc-Make- sure-we-always-have-an-overflow-checking.patch
deleted file mode 100644
index c9536e68ef..0000000000
--- a/meta/recipes-bsp/grub/files/calloc-Make-sure-we-always-have-an- overflow-checking.patch
+++ /dev/null

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -3

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

checking
- calloc() available

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -7

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

64e26162ebfe68317c143ca5ec996c892019f8f8

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +1 -80

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

on
-+ * integer overflow.
-+ */
-+void *
-+grub_calloc (grub_size_t nmemb, grub_size_t size) -+{
-+ void *ret;
-+ grub_size_t sz = 0;
-+
-+ if (grub_mul (nmemb, size, &sz))
-+ {
-+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-+ return NULL;
-+ }
-+
-+ ret = grub_memalign (0, sz);
-+ if (!ret)
-+ return NULL;
-+
-+ grub_memset (ret, 0, sz);
-+ return ret;
-+}
-+
- /* Allocate SIZE bytes and return the pointer. */
- void *
- grub_malloc (grub_size_t size)
-@@ -561,6 +587,20 @@ grub_mm_dump (unsigned lineno)

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -5

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_size_t size)
-+{
-+ void *ptr;
-+
-+ if (grub_mm_debug)
-+ grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%"
PRIxGRUB_SIZE ") = ",
-+ file, line, size);
-+ ptr = grub_calloc (nmemb, size);
-+ if (grub_mm_debug)
-+ grub_printf ("%p\n", ptr);
-+ return ptr;
-+}
-+
- void *
- grub_debug_malloc (const char *file, int line, grub_size_t size)
- {
-diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub- core/lib/libgcrypt_wrap/mem.c

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -36

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

core/lib/posix_wrap/stdlib.h

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -34

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

WARN_UNUSED_RESULT;
- void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT;
- void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
- char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +0 -34

Lines of this file are not shown. View the raw message.

meta/recipes- renamed from meta/recipes-bsp/grub/files/determinism.patch +0 -0

The rest of this diff is not shown. View the raw message.

bsp/grub/files/determinism.patch
index 3c1f562c71..2828e80975 100644

meta/recipes-bsp/grub/files/determinism.patch +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

genmoddep.awk is

meta/recipes-bsp/grub/files/determinism.patch +1 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

meta/recipes-bsp/grub/files/determinism.patch +3 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

using
+ genmoddep.awk is not deterministic since the order of the dependencies on
+ each line can vary depending on how awk sorts the values in the array.

Be deterministic in the output by sorting the dependencies on each line.

meta/recipes-bsp/grub/files/determinism.patch +6 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

==========================================================
=========
---- grub-2.04.orig/grub-core/genmoddep.awk
-+++ grub-2.04/grub-core/genmoddep.awk

meta/recipes-bsp/grub/files/determinism.patch +5 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

closure):

meta/recipes-bsp/grub/files/determinism.patch +11 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

mod

        depcount[mod]++
meta/recipes-bsp/grub/files/determinism.patch +0 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

==========================================================
=========
---- grub-2.04.orig/gentpl.py
-+++ grub-2.04/gentpl.py
-@@ -568,6 +568,7 @@ def foreach_platform_value(defn, platfor

meta/recipes-bsp/grub/files/determinism.patch +0 -9

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

==========================================================
=========
---- grub-2.04.orig/util/import_unicode.py
-+++ grub-2.04/util/import_unicode.py

meta/recipes-bsp/grub/files/determinism.patch +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_unicode_arabic_shapes[] = {\n ")

meta/recipes-bsp/grub/files/determinism.patch +0 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

(arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], arabicsubst[x][3], arabicsubst[x][4]))
+--
+2.17.1

meta/recipes-bsp/grub/files/determinism.patch +1 -0

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

handling.patch b/meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical- volume-handling.patch
deleted file mode 100644
index 2b8157f592..0000000000
--- a/meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical-volume- handling.patch
+++ /dev/null

(quoted diff) +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

(quoted diff) +0 -7

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

The
-performance of the original volume can be improved by storing the frequently

(quoted diff) +0 -4

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

be

(quoted diff) +0 -4

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

pool
-back to the origin LV to have increased performance. The drawback is potential

(quoted diff) +0 -5

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

taking

(quoted diff) +0 -5

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

the

(quoted diff) +0 -18

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

0454b0445393aafc5600e92ef0c39494e333b135

(quoted diff) +1 -29

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

char *flag)

(quoted diff) +0 -168

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

sizeof (*lv->segments));
-+ if (!cache->lv->segments)
-+ {
-+ grub_lvm_free_cache_lvs (cache_lvs);
-+ goto fail4;
-+ }
-+ grub_memcpy (cache->lv->segments, lv->segments, lv-

Quoted 1 line

segment_count * sizeof (*lv->segments));

-+
-+ for (i = 0; i < lv->segment_count; ++i)
-+ {
-+ struct grub_diskfilter_node *nodes = lv-

Quoted 1 line

segments[i].nodes;

-+ grub_size_t node_count = lv->segments[i].node_count;
-+
-+ cache->lv->segments[i].nodes = grub_malloc (node_count
* sizeof (*nodes));
-+ if (!cache->lv->segments[i].nodes)
-+ {
-+ for (j = 0; j < i; ++j)
-+ grub_free (cache->lv->segments[j].nodes);

-+                    grub_free (cache->lv->segments);
-+                    cache->lv->segments = NULL;
-+                    grub_lvm_free_cache_lvs (cache_lvs);
-+                    goto fail4;

-+ }
-+ grub_memcpy (cache->lv->segments[i].nodes, nodes,
node_count * sizeof (*nodes));
-+ }
-+
-+ if (cache->lv->segments)
-+ {

-+                cache->lv->segment_count = lv->segment_count;
-+                cache->lv->vg = vg;
-+                cache->lv->next = vg->lvs;
-+                vg->lvs = cache->lv;
-+                cache->lv = NULL;

-+ }
-+ }
-+ }
-+ }
-+
-+ grub_lvm_free_cache_lvs (cache_lvs);

(quoted diff) +0 -6

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

primitives-that-check-f.patch b/meta/recipes-bsp/grub/files/safemath-Add- some-arithmetic-primitives-that-check-f.patch
deleted file mode 100644
index 29021e8d8f..0000000000
--- a/meta/recipes-bsp/grub/files/safemath-Add-some-arithmetic- primitives-that-check-f.patch
+++ /dev/null

(quoted diff) +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

(quoted diff) +0 -3

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

for
- overflow

(quoted diff) +0 -14

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

68708c4503018d61dbcce7ac11cbb511d6425f4d

(quoted diff) +1 -21

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

defined(__clang_minor__)
-+# define CLANG_PREREQ(maj,min) \
-+ ((__clang_major__ > (maj)) || \
-+ (__clang_major__ == (maj) && __clang_minor__ >= (min)))
-+#else
-+# define CLANG_PREREQ(maj,min) 0
-+#endif
-+
- #endif /* ! GRUB_COMPILER_HEADER */

(quoted diff) +0 -46

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

grub_script_functio.patch b/meta/recipes-bsp/grub/files/script-Remove- unused-fields-from-grub_script_functio.patch
deleted file mode 100644
index 84a80d5ffd..0000000000
--- a/meta/recipes-bsp/grub/files/script-Remove-unused-fields-from- grub_script_functio.patch
+++ /dev/null

(quoted diff) +0 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2001

(quoted diff) +0 -3

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

grub_script_function
- struct

(quoted diff) +0 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

1a8d9c9b4ab6df7669b5aa36a56477f297825b96

(quoted diff) +0 -30

Lines of this file are not shown. View the raw message.

meta/recipes- renamed from meta/recipes-bsp/grub/grub-efi_2.04.bb +0 -0

The rest of this diff is not shown. View the raw message.

bsp/grub/grub-efi_git.bb
similarity index 98%
rename from meta/recipes-bsp/grub/grub-efi_2.04.bb rename to meta/recipes-bsp/grub/grub-efi_git.bb index 287845c507..240fde7dbf 100644

meta/recipes-bsp/grub/grub-efi_git.bb renamed from meta/recipes-bsp/grub/grub-efi_2.04.bb +0 -2

Lines of this file are not shown. View the raw message.

meta/recipes- renamed from meta/recipes-bsp/grub/grub2.inc +0 -0

The rest of this diff is not shown. View the raw message.

bsp/grub/grub2.inc
index f870d41f6a..bcff676c26 100644

meta/recipes-bsp/grub/grub2.inc +0 -0
@@ -13,25 +13,23 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

CVE_PRODUCT = "grub2"

meta/recipes-bsp/grub/grub2.inc +1 -7

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

overflow-checking-primitives-where-we-do-.patch \

meta/recipes-bsp/grub/grub2.inc +0 -2

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

a-func.patch \
- file://CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-
handling.patch \

meta/recipes-bsp/grub/grub2.inc +0 -3

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

"f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea"

meta/recipes-bsp/grub/grub2.inc +2 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

"2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484"

meta/recipes-bsp/grub/grub2.inc +8 -0

Lines of this file are not shown. View the raw message.

meta/recipes- renamed from meta/recipes-bsp/grub/grub_2.04.bb +0 -0

The rest of this diff is not shown. View the raw message.

bsp/grub/grub_git.bb
similarity index 100%
rename from meta/recipes-bsp/grub/grub_2.04.bb
rename to meta/recipes-bsp/grub/grub_git.bb
--
2.17.1

Part of the diff is not shown here. View the raw message.