rpms/grub/F-11 grub-fix-memory-corruption.patch, NONE, 1.1 grub.spec, 1.95, 1.96
Peter Jones
pjones at fedoraproject.org
Thu Jun 4 13:49:55 UTC 2009
Author: pjones
Update of /cvs/extras/rpms/grub/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11910
Modified Files:
grub.spec
Added Files:
grub-fix-memory-corruption.patch
Log Message:
* Thu Jun 04 2009 Peter Jones <pjones at redhat.com> - 0.97-51
- Fix memory corruption in "setup" command. (#496093)
grub-fix-memory-corruption.patch:
--- NEW FILE grub-fix-memory-corruption.patch ---
diff -u -r -p grub-0.97/stage2/builtins.c grub.fixed/stage2/builtins.c
--- grub-0.97/stage2/builtins.c 2005-02-15 22:58:23.000000000 +0100
+++ grub.fixed/stage2/builtins.c 2007-12-07 22:23:01.000000000 +0100
@@ -3830,15 +3830,15 @@ setup_func (char *arg, int flags)
{
char tmp[16];
grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF);
- grub_strncat (device, tmp, 256);
+ grub_strncat (device, tmp, 16);
}
if ((partition & 0x00FF00) != 0x00FF00)
{
char tmp[16];
grub_sprintf (tmp, ",%c", 'a' + ((partition >> 8) & 0xFF));
- grub_strncat (device, tmp, 256);
+ grub_strncat (device, tmp, 16);
}
- grub_strncat (device, ")", 256);
+ grub_strncat (device, ")", 16);
}
int embed_stage1_5 (char *stage1_5, int drive, int partition)
Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/F-11/grub.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- grub.spec 29 Apr 2009 21:27:38 -0000 1.95
+++ grub.spec 4 Jun 2009 13:49:25 -0000 1.96
@@ -1,6 +1,6 @@
Name: grub
Version: 0.97
-Release: 50%{?dist}
+Release: 51%{?dist}
Summary: Grand Unified Boot Loader.
Group: System Environment/Base
License: GPLv2+
@@ -42,6 +42,7 @@ Patch13: grub-0.97-efipxe.patch
Patch14: grub-0.97-tolower.patch
Patch15: grub-low-memory.patch
Patch16: grub-install_virtio_blk_support.patch
+Patch17: grub-fix-memory-corruption.patch
%description
GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -68,6 +69,7 @@ systems.
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%build
autoreconf
@@ -130,6 +132,9 @@ fi
%{_datadir}/grub
%changelog
+* Thu Jun 04 2009 Peter Jones <pjones at redhat.com> - 0.97-51
+- Fix memory corruption in "setup" command. (#496093)
+
* Wed Apr 29 2009 Peter Jones <pjones at redhat.com> - 0.97-50
- Handle virtio_blk disks and their crazy new device name in grub-install
(rhbz#479760)
More information about the fedora-extras-commits
mailing list