Message ID | 20170528135611.10218-1-bernd.kuhls@t-online.de |
---|---|
State | Accepted |
Headers | show |
Hello, On Sun, 28 May 2017 15:56:11 +0200, Bernd Kuhls wrote: > Fixes buffer overflow: > https://mail.coreboot.org/pipermail/flashrom/2016-March/014523.html > > Removed patch 0002-sys-io.h.patch, not needed anymore, hwaccess.h now > contains a similar fix: > > elif defined(__linux__) || defined(__GLIBC__) > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/flashrom/0002-sys-io.h.patch | 27 --------------------------- > package/flashrom/flashrom.hash | 2 +- > package/flashrom/flashrom.mk | 2 +- > 3 files changed, 2 insertions(+), 29 deletions(-) > delete mode 100644 package/flashrom/0002-sys-io.h.patch Applied to master, thanks. Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Fixes buffer overflow: > https://mail.coreboot.org/pipermail/flashrom/2016-March/014523.html > Removed patch 0002-sys-io.h.patch, not needed anymore, hwaccess.h now > contains a similar fix: > elif defined(__linux__) || defined(__GLIBC__) > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2017.02.x, thanks.
diff --git a/package/flashrom/0002-sys-io.h.patch b/package/flashrom/0002-sys-io.h.patch deleted file mode 100644 index 8d990c6f9..000000000 --- a/package/flashrom/0002-sys-io.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -hwaccess: sys/io.h is not specific to glibc - -Under Linux, sys/io.h provides inb and outb, so we really need it. -However, its inclusion is conditional to the _GLIBC_ define. This is -usually OK under Linux, since both glibc and uClibc define it (uclibc -fakes being glibc). - -But the musl C library does not impersonate glibc, so we're missing -including sys/io.h in this case. - -Change the include from checking _GLIBC_ to checking whether this is -Linux, looking for the __linux__ define. - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - -diff -durN flashrom-0.9.8.orig/hwaccess.h flashrom-0.9.8/hwaccess.h ---- flashrom-0.9.8.orig/hwaccess.h 2015-02-10 09:03:10.000000000 +0100 -+++ flashrom-0.9.8/hwaccess.h 2015-10-28 20:01:54.259202484 +0100 -@@ -27,7 +27,7 @@ - #include "platform.h" - - #if IS_X86 --#if defined(__GLIBC__) -+#if defined(__linux__) - #include <sys/io.h> - #endif - #endif diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index a2168699f..64b67b99c 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 13dc7c895e583111ecca370363a3527d237d178a134a94b20db7df177c05f934 flashrom-0.9.8.tar.bz2 +sha256 cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45 flashrom-0.9.9.tar.bz2 diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 0b89bf3e6..4ecdce8f4 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 0.9.8 +FLASHROM_VERSION = 0.9.9 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = http://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf
Fixes buffer overflow: https://mail.coreboot.org/pipermail/flashrom/2016-March/014523.html Removed patch 0002-sys-io.h.patch, not needed anymore, hwaccess.h now contains a similar fix: elif defined(__linux__) || defined(__GLIBC__) Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/flashrom/0002-sys-io.h.patch | 27 --------------------------- package/flashrom/flashrom.hash | 2 +- package/flashrom/flashrom.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/flashrom/0002-sys-io.h.patch