ath9k_hw: Fix bug in eeprom data length validation for AR9485
authorVasanthakumar Thiagarajan <vasanth@atheros.com>
Tue, 21 Dec 2010 09:42:43 +0000 (01:42 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Dec 2010 20:43:28 +0000 (15:43 -0500)
The size of the eeprom data is 1088 bytes for AR9485. But
a sanity check is done against 4K which would result in a
'potential read past the end of the buffer' smatch complaint.

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

index d7deae85d98081325e78940ab225afe484d0bccc..5d81c5360b9cc5aabc16f6c9fd25df874f1094c7 100644 (file)
@@ -59,6 +59,8 @@
 
 #define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6))
 
+#define EEPROM_DATA_LEN_9485   1088
+
 static int ar9003_hw_power_interpolate(int32_t x,
                                       int32_t *px, int32_t *py, u_int16_t np);
 
@@ -3367,7 +3369,7 @@ found:
                        "Found block at %x: code=%d ref=%d length=%d major=%d minor=%d\n",
                        cptr, code, reference, length, major, minor);
                if ((!AR_SREV_9485(ah) && length >= 1024) ||
-                   (AR_SREV_9485(ah) && length >= (4 * 1024))) {
+                   (AR_SREV_9485(ah) && length > EEPROM_DATA_LEN_9485)) {
                        ath_dbg(common, ATH_DBG_EEPROM,
                                "Skipping bad header\n");
                        cptr -= COMP_HDR_LEN;