|
 |
39700a |
From 3cb3d2a07b11c95b3f8a908ae9d43eabef4dcf62 Mon Sep 17 00:00:00 2001
|
|
|
39700a |
From: Peter Jones <pjones@redhat.com>
|
|
|
39700a |
Date: Wed, 17 Sep 2014 15:13:14 -0500
|
|
|
39700a |
Subject: [PATCH 1/2] Initialized initrd_ctx so we don't free a random pointer
|
|
|
39700a |
from the stack.
|
|
|
39700a |
|
|
|
39700a |
Currently, if "linux" fails, the "goto fail;" in grub_cmd_initrd sends us
|
|
|
39700a |
into grub_initrd_close() without grub_initrd_init() being called, and thus
|
|
|
39700a |
it never clears initrd_ctx->components. grub_initrd_close() then frees that
|
|
|
39700a |
address, which is stale data from the stack. If the stack happens to have a
|
|
|
39700a |
stale *address* there that matches a recent allocation, then you'll get a
|
|
|
39700a |
double free later.
|
|
|
39700a |
|
|
|
39700a |
So initialize the memory up front.
|
|
|
39700a |
|
|
|
39700a |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
39700a |
---
|
|
|
39700a |
grub-core/loader/arm/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/arm64/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/i386/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/i386/pc/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/ia64/efi/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/mips/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/powerpc/ieee1275/linux.c | 2 +-
|
|
|
39700a |
grub-core/loader/sparc64/ieee1275/linux.c | 2 +-
|
|
|
39700a |
8 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
39700a |
|
|
|
39700a |
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
|
|
|
39700a |
index e6770d9..62cbe75 100644
|
|
|
39700a |
--- a/grub-core/loader/arm/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/arm/linux.c
|
|
|
39700a |
@@ -396,7 +396,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
{
|
|
|
39700a |
grub_file_t file;
|
|
|
39700a |
grub_size_t size = 0;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
|
|
39700a |
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
|
|
39700a |
index f1d10a1..0dc144e 100644
|
|
|
39700a |
--- a/grub-core/loader/arm64/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/arm64/linux.c
|
|
|
39700a |
@@ -328,7 +328,7 @@ static grub_err_t
|
|
|
39700a |
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
int argc, char *argv[])
|
|
|
39700a |
{
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
int initrd_size, initrd_pages;
|
|
|
39700a |
void *initrd_mem = NULL;
|
|
|
39700a |
|
|
|
39700a |
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
39700a |
index 31fb91e..2ae1763 100644
|
|
|
39700a |
--- a/grub-core/loader/i386/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/i386/linux.c
|
|
|
39700a |
@@ -1050,7 +1050,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
grub_addr_t addr_min, addr_max;
|
|
|
39700a |
grub_addr_t addr;
|
|
|
39700a |
grub_err_t err;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
{
|
|
|
39700a |
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
|
|
|
39700a |
index 672c013..b481e46 100644
|
|
|
39700a |
--- a/grub-core/loader/i386/pc/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/i386/pc/linux.c
|
|
|
39700a |
@@ -388,7 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
grub_uint8_t *initrd_chunk;
|
|
|
39700a |
grub_addr_t initrd_addr;
|
|
|
39700a |
grub_err_t err;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
{
|
|
|
39700a |
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
|
|
|
39700a |
index 87ac49f..eb78e6e 100644
|
|
|
39700a |
--- a/grub-core/loader/ia64/efi/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/ia64/efi/linux.c
|
|
|
39700a |
@@ -568,7 +568,7 @@ static grub_err_t
|
|
|
39700a |
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
int argc, char *argv[])
|
|
|
39700a |
{
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
{
|
|
|
39700a |
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
|
|
|
39700a |
index ef64a5b..4a3e8c5 100644
|
|
|
39700a |
--- a/grub-core/loader/mips/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/mips/linux.c
|
|
|
39700a |
@@ -415,7 +415,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
void *initrd_src;
|
|
|
39700a |
grub_addr_t initrd_dest;
|
|
|
39700a |
grub_err_t err;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
|
|
39700a |
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
|
39700a |
index 4a14f66..787d7dc 100644
|
|
|
39700a |
--- a/grub-core/loader/powerpc/ieee1275/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
|
39700a |
@@ -333,7 +333,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
grub_size_t size = 0;
|
|
|
39700a |
grub_addr_t first_addr;
|
|
|
39700a |
grub_addr_t addr;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
{
|
|
|
39700a |
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
|
|
|
39700a |
index de6ee2f..c5e8dfa 100644
|
|
|
39700a |
--- a/grub-core/loader/sparc64/ieee1275/linux.c
|
|
|
39700a |
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
|
|
|
39700a |
@@ -373,7 +373,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
39700a |
grub_addr_t paddr;
|
|
|
39700a |
grub_addr_t addr;
|
|
|
39700a |
int ret;
|
|
|
39700a |
- struct grub_linux_initrd_context initrd_ctx;
|
|
|
39700a |
+ struct grub_linux_initrd_context initrd_ctx = { 0, };
|
|
|
39700a |
|
|
|
39700a |
if (argc == 0)
|
|
|
39700a |
{
|
|
|
39700a |
--
|
|
|
39700a |
1.9.3
|
|
|
39700a |
|