summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali>2011-01-25 16:19:42 +0000
committerkhali <khali>2011-01-25 16:19:42 +0000
commit078d01547fc4e71ec0445c2ebdff608ff792a617 (patch)
tree98a128796f1f221a6b01b5687da536f9f395d728
parent776f4f51bccd27fb7acdec7e006c791dd726f244 (diff)
downloaddmidecode-078d01547fc4e71ec0445c2ebdff608ff792a617.tar.gz
Fix boundary checks of memory array location codes (DMI type 16). Reported
by Andrey Matveyev.
-rw-r--r--AUTHORS1
-rw-r--r--CHANGELOG5
-rw-r--r--dmidecode.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 7ec5a51..c0b96ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -81,3 +81,4 @@ Murlin Wenzel
Harald Mueller-Ney
Lars Mueller
Thomas Mingarelli
+Andrey Matveyev
diff --git a/CHANGELOG b/CHANGELOG
index 0545f8a..de3d7e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2011-01-25 Jean Delvare <khali@linux-fr.org>
+
+ * dmidecode.c: Fix boundary checks of memory array location codes
+ (DMI type 16). Reported by Andrey Matveyev.
+
2010-11-24 Jean Delvare <khali@linux-fr.org>
* dmidecode.c: Assume that the max power capacity is expressed in
diff --git a/dmidecode.c b/dmidecode.c
index 5c7ad0e..7b081f9 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -2100,7 +2100,7 @@ static const char *dmi_memory_array_location(u8 code)
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;
}