From 50034b0d4f17ef4c7f6bb5576c84f930c9002e4b Mon Sep 17 00:00:00 2001 From: khali Date: Mon, 29 Jun 2015 11:07:36 +0000 Subject: 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 --- eeprom/decode-dimms | 8 ++++++-- 1 file 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; -- cgit v1.2.1