Fix double-free in grub-probe.

This commit is contained in:
Peter Jones 2012-06-18 15:52:14 -04:00
parent c4a749da08
commit 8205bedc55
2 changed files with 22 additions and 1 deletions

View file

@ -0,0 +1,17 @@
From: Vladimir Serbinenko <phcoder@gmail.com>
Subject: Avoid double-free in grub-probe
Date: 2012-06-05 15:16:14 +0000
=== modified file 'util/grub-probe.c'
--- a/util/grub-probe.c 2012-06-05 09:31:10 +0000
+++ b/util/grub-probe.c 2012-06-05 15:16:14 +0000
@@ -169,8 +169,6 @@
}
*d = 0;
- free ((char *) orig_path);
-
return new_path;
}

View file

@ -39,7 +39,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.0 Version: 2.0
Release: 0.36.beta6%{?dist} Release: 0.37.beta6%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
@ -63,6 +63,7 @@ Patch16: grub-2.00-no-huge-video.patch
Patch17: grub-2.00-ppc-hints.patch Patch17: grub-2.00-ppc-hints.patch
Patch18: grub-2.00-support-vscsi-on-ibm-ppc.patch Patch18: grub-2.00-support-vscsi-on-ibm-ppc.patch
Patch19: grub-2.00-ppc-usb-quiesce.patch Patch19: grub-2.00-ppc-usb-quiesce.patch
Patch20: grub-2.00-no-double-free.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -388,6 +389,9 @@ fi
%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 %doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
%changelog %changelog
* Mon Jun 18 2012 Peter Jones <pjones@redhat.com> - 2.0-0.37.beta6
- Fix double-free in grub-probe.
* Wed Jun 06 2012 Peter Jones <pjones@redhat.com> - 2.0-0.36.beta6 * Wed Jun 06 2012 Peter Jones <pjones@redhat.com> - 2.0-0.36.beta6
- Build with patch19 applied. - Build with patch19 applied.