summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/eeprom.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-27 22:19:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-28 14:06:54 -0500
commita5a7103fe18eb4312bd89c9f136fb850af58faf4 (patch)
tree2242178941a40c30adcc13705bf990249bb9093b /drivers/net/wireless/p54/eeprom.c
parentc2a7dca0ce0e6ceb13f9030ff8e9731eaa14cc02 (diff)
downloadop-kernel-dev-a5a7103fe18eb4312bd89c9f136fb850af58faf4.zip
op-kernel-dev-a5a7103fe18eb4312bd89c9f136fb850af58faf4.tar.gz
p54: fix a NULL pointer dereference bug
If the RSSI calibration table was not found or not parsed properly, priv->rssi_db will be NULL, p54_rssi_find needs to be able to deal with that. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Acked-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/eeprom.c')
-rw-r--r--drivers/net/wireless/p54/eeprom.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index f54e15f..13d750d 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -524,10 +524,13 @@ err_data:
struct p54_rssi_db_entry *p54_rssi_find(struct p54_common *priv, const u16 freq)
{
- struct p54_rssi_db_entry *entry = (void *)(priv->rssi_db->data +
- priv->rssi_db->offset);
+ struct p54_rssi_db_entry *entry;
int i, found = -1;
+ if (!priv->rssi_db)
+ return &p54_rssi_default;
+
+ entry = (void *)(priv->rssi_db->data + priv->rssi_db->offset);
for (i = 0; i < priv->rssi_db->entries; i++) {
if (!same_band(freq, entry[i].freq))
continue;
OpenPOWER on IntegriCloud