|
@@ -23,6 +23,7 @@
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
#include <net/mac80211.h>
|
|
|
+#include <linux/crc-ccitt.h>
|
|
|
|
|
|
#include "p54.h"
|
|
|
#include "eeprom.h"
|
|
@@ -540,6 +541,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
|
|
|
int err;
|
|
|
u8 *end = (u8 *)eeprom + len;
|
|
|
u16 synth = 0;
|
|
|
+ u16 crc16 = ~0;
|
|
|
|
|
|
wrap = (struct eeprom_pda_wrap *) eeprom;
|
|
|
entry = (void *)wrap->data + le16_to_cpu(wrap->len);
|
|
@@ -655,16 +657,29 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
|
|
|
}
|
|
|
break;
|
|
|
case PDR_END:
|
|
|
- /* make it overrun */
|
|
|
- entry_len = len;
|
|
|
+ crc16 = ~crc_ccitt(crc16, (u8 *) entry, sizeof(*entry));
|
|
|
+ if (crc16 != le16_to_cpup((__le16 *)entry->data)) {
|
|
|
+ wiphy_err(dev->wiphy, "eeprom failed checksum "
|
|
|
+ "test!\n");
|
|
|
+ err = -ENOMSG;
|
|
|
+ goto err;
|
|
|
+ } else {
|
|
|
+ goto good_eeprom;
|
|
|
+ }
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- entry = (void *)entry + (entry_len + 1)*2;
|
|
|
+ crc16 = crc_ccitt(crc16, (u8 *)entry, (entry_len + 1) * 2);
|
|
|
+ entry = (void *)entry + (entry_len + 1) * 2;
|
|
|
}
|
|
|
|
|
|
+ wiphy_err(dev->wiphy, "unexpected end of eeprom data.\n");
|
|
|
+ err = -ENODATA;
|
|
|
+ goto err;
|
|
|
+
|
|
|
+good_eeprom:
|
|
|
if (!synth || !priv->iq_autocal || !priv->output_limit ||
|
|
|
!priv->curve_data) {
|
|
|
wiphy_err(dev->wiphy,
|