From c412925c8f33a0d7708d6e536fbbe5e38902ea5f985fe49394ef874643203cd1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 24 Jan 2011 15:17:46 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/dmidecode revision 9.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=499114ff5e8bfae4acbd9a3552e7cb6c --- dmidecode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmidecode.spec b/dmidecode.spec index d8966ac..ea9cd1f 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,5 +1,5 @@ # -# spec file for package dmidecode (Version 2.11) +# spec file for package dmidecode # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # From 3ea38f8b549e0d4335d038fa8713ddfafeaa41cf47f47446c1600cd607ab708a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 25 Jan 2011 17:02:53 +0000 Subject: [PATCH 2/3] - dmidecode-fix-memory-array-location-overrun.patch: Fix boundary checks of memory array location codes (DMI type 16). OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=10 --- ...ecode-fix-memory-array-location-overrun.patch | 16 ++++++++++++++++ dmidecode.changes | 6 ++++++ dmidecode.spec | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 dmidecode-fix-memory-array-location-overrun.patch diff --git a/dmidecode-fix-memory-array-location-overrun.patch b/dmidecode-fix-memory-array-location-overrun.patch new file mode 100644 index 0000000..ff96bea --- /dev/null +++ b/dmidecode-fix-memory-array-location-overrun.patch @@ -0,0 +1,16 @@ +Upstream: http://cvs.savannah.gnu.org/viewvc/dmidecode/dmidecode.c?root=dmidecode&r1=1.166&r2=1.167 + +Fix boundary checks of memory array location codes (DMI type 16). +Reported by Andrey Matveyev. + +--- dmidecode/dmidecode.c 2010/11/24 20:48:19 1.166 ++++ dmidecode/dmidecode.c 2011/01/25 16:19:42 1.167 +@@ -2100,7 +2100,7 @@ + + if (code >= 0x01 && code <= 0x0A) + return location[code - 0x01]; +- if (code >= 0xA0 && code <= 0xA4) ++ if (code >= 0xA0 && code <= 0xA3) + return location_0xA0[code - 0xA0]; + return out_of_spec; + } diff --git a/dmidecode.changes b/dmidecode.changes index 7ed94a4..8097af0 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 25 17:58:57 CET 2011 - jdelvare@suse.de + +- dmidecode-fix-memory-array-location-overrun.patch: Fix boundary + checks of memory array location codes (DMI type 16). + ------------------------------------------------------------------- Thu Jan 20 13:53:27 CET 2011 - jdelvare@suse.de diff --git a/dmidecode.spec b/dmidecode.spec index ea9cd1f..3dbf230 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -28,6 +28,7 @@ Provides: pmtools:/usr/sbin/dmidecode AutoReqProv: on Summary: DMI table decoder Source: %{name}-%{version}.tar.bz2 +Patch1: dmidecode-fix-memory-array-location-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 Obsoletes: pmtools < 20071117 @@ -48,6 +49,7 @@ the BIOS told it to. %prep %setup +%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" From c5ecd5769c660889cc065ee4e349c2ecfaf69dd8f858c40f5df12da02d609a4b Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 25 Jan 2011 17:11:47 +0000 Subject: [PATCH 3/3] Fix typo in spec file. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=11 --- dmidecode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmidecode.spec b/dmidecode.spec index 3dbf230..b328704 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -28,7 +28,7 @@ Provides: pmtools:/usr/sbin/dmidecode AutoReqProv: on Summary: DMI table decoder Source: %{name}-%{version}.tar.bz2 -Patch1: dmidecode-fix-memory-array-location-overflow.patch +Patch1: dmidecode-fix-memory-array-location-overrun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 Obsoletes: pmtools < 20071117