PPC fix from pfsmorigo.

This commit is contained in:
Peter Jones 2012-11-27 15:22:01 -05:00
parent 70feba3bb4
commit 29be933c90
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 7e1f42417dab20d470d1e45dfa73d00c763d792d Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 19 Sep 2012 20:50:38 -0300
Subject: [PATCH] increase the ieee1275 device path buffer size
There are cases when the openfirmware device path is bigger then 64 chars.
This should fix this bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=857936
---
grub-core/kern/ieee1275/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index 7d03a8a..5c45947 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -82,7 +82,7 @@ void (*grub_ieee1275_net_config) (const char *dev,
void
grub_machine_get_bootlocation (char **device, char **path)
{
- char bootpath[64]; /* XXX check length */
+ char bootpath[256]; /* Max device path length */
char *filename;
char *type;
--
1.7.10.4

View File

@ -39,7 +39,7 @@
Name: grub2
Epoch: 1
Version: 2.0
Release: 0.38.beta6%{?dist}
Release: 0.39%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@ -65,6 +65,7 @@ Patch18: grub-2.00-support-vscsi-on-ibm-ppc.patch
Patch19: grub-2.00-ppc-usb-quiesce.patch
Patch20: grub-2.00-no-double-free.patch
Patch21: grub-2.00-ppc_handle_devices_with_comma.patch
Patch22: grub-2.00-increase-the-ieee1275-device-path-buffer-size.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -390,6 +391,9 @@ fi
%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
%changelog
* Tue Nov 27 2012 Peter Jones <pjones@redhat.com> - 2.0-0.39
- Fix device path truncations on ppc (pfsmorigo, #857305)
* Thu Aug 02 2012 Peter Jones <pjones@redhat.com> - 2.0-0.38.beta6
- PPC - Handle device paths with commas correctly.
Related: rhbz#828740