b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From c7fbe6c1ae22ac9853b03a3d4d742712f31e69b9 Mon Sep 17 00:00:00 2001
|
|
From: Ram Pai <linuxram@us.ibm.com>
|
|
Date: Tue, 25 Feb 2014 23:31:06 +0000
|
|
Subject: [PATCH 23/23] grub segfaults if initrd is specified before specifying
|
|
|
|
grub segfaults if initrd is specified before specifying
|
|
the kernel. The problem is the initrd module sees that kernel is not
|
|
specified and takes the fail path. In the fail path it checks if anything has
|
|
be malloc'ed. Unfortunately the variable that it looks to check for is a
|
|
uninitialized stack variable. The stack variable can incorrectly indicate
|
|
something is malloced, which leads the module to free some unallocated
|
|
memory. This patch fixes the problem by initializing the stack variable.
|
|
|
|
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
|
|
---
|
|
grub-core/loader/powerpc/ieee1275/linux.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
index 9dde053..0d94433 100644
|
|
--- a/grub-core/loader/powerpc/ieee1275/linux.c
|
|
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
@@ -335,6 +335,10 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
grub_addr_t addr;
|
|
struct grub_linux_initrd_context initrd_ctx;
|
|
|
|
+ // initialize, otherwise the fail path will try to
|
|
+ // free up data and segfault
|
|
+ initrd_ctx.components = NULL;
|
|
+
|
|
if (argc == 0)
|
|
{
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
|
--
|
|
1.8.3.1
|