rpms/grub/devel grub-fedora-9.patch,1.4,1.5 grub.spec,1.65,1.66

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3968

Modified Files:
	grub-fedora-9.patch grub.spec 
Log Message:
Bump to -25


grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-fedora-9.patch	27 Feb 2008 21:39:13 -0000	1.4
+++ grub-fedora-9.patch	28 Feb 2008 00:17:17 -0000	1.5
@@ -24868,7 +24868,7 @@
 +
 diff --git a/efi/ia32/loader/linux.c b/efi/ia32/loader/linux.c
 new file mode 100644
-index 0000000..331d413
+index 0000000..088b126
 --- /dev/null
 +++ b/efi/ia32/loader/linux.c
 @@ -0,0 +1,911 @@
@@ -25734,7 +25734,7 @@
 +      if (tdesc.physical_start < addr_min
 +              && tdesc.num_pages > ((addr_min - tdesc.physical_start) >> 12))
 +        {
-+          tdesc.num_pages += ((addr_min - tdesc.physical_start) >> 12);
++          tdesc.num_pages -= ((addr_min - tdesc.physical_start) >> 12);
 +          tdesc.physical_start = addr_min;
 +        }
 +
@@ -26620,10 +26620,10 @@
 +
 diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
 new file mode 100644
-index 0000000..ccb4d7c
+index 0000000..b618ef3
 --- /dev/null
 +++ b/efi/x86_64/loader/linux.c
-@@ -0,0 +1,821 @@
+@@ -0,0 +1,827 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -27398,15 +27398,21 @@
 +      if (desc->type != GRUB_EFI_CONVENTIONAL_MEMORY)
 +        continue;
 +      memcpy(&tdesc, desc, sizeof (tdesc));
++      if (tdesc.physical_start < addr_min
++              && tdesc.num_pages > ((addr_min - tdesc.physical_start) >> 12))
++        {
++          tdesc.num_pages -= ((addr_min - tdesc.physical_start) >> 12);
++          tdesc.physical_start = addr_min;
++        }
 +
 +      grub_dprintf(__func__, "desc = {type=%d,ps=0x%llx,vs=0x%llx,sz=%llu,attr=%llu}\n", desc->type, (unsigned long long)desc->physical_start, (unsigned long long)desc->virtual_start, (unsigned long long)desc->num_pages, (unsigned long long)desc->attribute);
-+      if (desc->physical_start >= addr_min
-+	  && desc->physical_start + page_align (size) <= addr_max
-+	  && desc->num_pages >= initrd_pages)
++      if (tdesc.physical_start >= addr_min
++	  && tdesc.physical_start + page_align (size) <= addr_max
++	  && tdesc.num_pages >= initrd_pages)
 +	{
 +	  grub_efi_physical_address_t physical_end;
 +
-+	  physical_end = desc->physical_start + (desc->num_pages << 12);
++	  physical_end = tdesc.physical_start + (tdesc.num_pages << 12);
 +	  if (physical_end > addr_max)
 +	    physical_end = addr_max;
 +


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- grub.spec	27 Feb 2008 21:39:13 -0000	1.65
+++ grub.spec	28 Feb 2008 00:17:17 -0000	1.66
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -87,6 +87,9 @@
 #/sbin/grub-efi
 
 %changelog
+* Wed Feb 27 2008 Peter Jones <pjones at redhat.com> - 0.97-25
+- Fix memory allocation bug in EFI on i386 and x86_64.
+
 * Wed Feb 27 2008 Peter Jones <pjones at redhat.com> - 0.97-24
 - Fix build of xfs code on amd64.