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"