File 0001-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch of Package grub2.16099
From 631a82003851ca68bfaf87e12be5c94e14cd2a91 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 17 Sep 2014 16:30:11 -0400
Subject: [PATCH] Initialized initrd_ctx so we don't free a random pointer from
the stack.
Currently, if "linux" fails, the "goto fail;" in grub_cmd_initrd sends us
into grub_initrd_close() without grub_initrd_init() being called, and thus
it never clears initrd_ctx->components. grub_initrd_close() then frees that
address, which is stale data from the stack. If the stack happens to have a
stale *address* there that matches a recent allocation, then you'll get a
double free later.
So initialize the memory up front.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
ChangeLog | 12 ++++++++++++
grub-core/loader/arm/linux.c | 2 +-
grub-core/loader/arm64/linux.c | 2 +-
grub-core/loader/i386/linux.c | 2 +-
grub-core/loader/i386/pc/linux.c | 2 +-
grub-core/loader/ia64/efi/linux.c | 2 +-
grub-core/loader/mips/linux.c | 2 +-
grub-core/loader/powerpc/ieee1275/linux.c | 2 +-
grub-core/loader/sparc64/ieee1275/linux.c | 2 +-
9 files changed, 20 insertions(+), 8 deletions(-)
Index: grub-2.02~beta2/grub-core/loader/arm/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/arm/linux.c
+++ grub-2.02~beta2/grub-core/loader/arm/linux.c
@@ -396,7 +396,7 @@ grub_cmd_initrd (grub_command_t cmd __at
{
grub_file_t file;
grub_size_t size = 0;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
Index: grub-2.02~beta2/grub-core/loader/arm64/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/arm64/linux.c
+++ grub-2.02~beta2/grub-core/loader/arm64/linux.c
@@ -328,7 +328,7 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[])
{
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
int initrd_size, initrd_pages;
void *initrd_mem = NULL;
Index: grub-2.02~beta2/grub-core/loader/i386/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/i386/linux.c
+++ grub-2.02~beta2/grub-core/loader/i386/linux.c
@@ -1050,7 +1050,7 @@ grub_cmd_initrd (grub_command_t cmd __at
grub_addr_t addr_min, addr_max;
grub_addr_t addr;
grub_err_t err;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
{
Index: grub-2.02~beta2/grub-core/loader/i386/pc/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/i386/pc/linux.c
+++ grub-2.02~beta2/grub-core/loader/i386/pc/linux.c
@@ -388,7 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __at
grub_uint8_t *initrd_chunk;
grub_addr_t initrd_addr;
grub_err_t err;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
{
Index: grub-2.02~beta2/grub-core/loader/ia64/efi/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/ia64/efi/linux.c
+++ grub-2.02~beta2/grub-core/loader/ia64/efi/linux.c
@@ -568,7 +568,7 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[])
{
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
{
Index: grub-2.02~beta2/grub-core/loader/mips/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/mips/linux.c
+++ grub-2.02~beta2/grub-core/loader/mips/linux.c
@@ -415,7 +415,7 @@ grub_cmd_initrd (grub_command_t cmd __at
void *initrd_src;
grub_addr_t initrd_dest;
grub_err_t err;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
Index: grub-2.02~beta2/grub-core/loader/powerpc/ieee1275/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/powerpc/ieee1275/linux.c
+++ grub-2.02~beta2/grub-core/loader/powerpc/ieee1275/linux.c
@@ -333,7 +333,7 @@ grub_cmd_initrd (grub_command_t cmd __at
grub_size_t size = 0;
grub_addr_t first_addr;
grub_addr_t addr;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
// initialize, otherwise the fail path will try to
// free up data and segfault
Index: grub-2.02~beta2/grub-core/loader/sparc64/ieee1275/linux.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/loader/sparc64/ieee1275/linux.c
+++ grub-2.02~beta2/grub-core/loader/sparc64/ieee1275/linux.c
@@ -373,7 +373,7 @@ grub_cmd_initrd (grub_command_t cmd __at
grub_addr_t paddr;
grub_addr_t addr;
int ret;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
if (argc == 0)
{
