summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2015-06-29 11:07:36 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2015-06-29 11:07:36 +0000
commit50034b0d4f17ef4c7f6bb5576c84f930c9002e4b (patch)
treebcb8ddb16f82c2ee2be8f98a689659e3138e0293
parent77d73b84a931b8a2b8e6dd07a977b4a003f7fcaf (diff)
downloadi2c-tools-50034b0d4f17ef4c7f6bb5576c84f930c9002e4b.tar.gz
decode-dimms: Complete check for out-of-bounds vendor ID
We also need to discard vendor ID 0 and to report "Unknown" if the vendor is in a page we don't support yet. Additionally, check that data is present at all for DDR3 modules as we already do for pre-DDR3 modules. git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@6296 7894878c-1315-0410-8ee3-d5d059ff63e0
-rwxr-xr-xeeprom/decode-dimms8
1 files changed, 6 insertions, 2 deletions
diff --git a/eeprom/decode-dimms b/eeprom/decode-dimms
index 2eb1975..660c5e7 100755
--- a/eeprom/decode-dimms
+++ b/eeprom/decode-dimms
@@ -344,8 +344,12 @@ sub manufacturer_ddr3($$)
my ($count, $code) = @_;
my $manufacturer;
- return "Invalid" if parity($code) != 1;
- return "Unknown" if ($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]};
+ return "Undefined" unless spd_written($count, $code);
+
+ return "Invalid" if parity($code) != 1
+ or ($code & 0x7F) == 0;
+ return "Unknown" if ($count & 0x7F) >= @vendors
+ or ($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]};
$manufacturer = $vendors[$count & 0x7F][($code & 0x7F) - 1];
$manufacturer =~ s/ \(former .*\)$// if $opt_side_by_side;
$manufacturer .= "? (Invalid parity)" if parity($count) != 1;