aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-10 23:21:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-10 23:21:02 +0000
commit515fa69f8f0357afe9159a718ff254cf936c754e (patch)
tree898ace10e9239ba98a7284344a58984041fba7b3
parent434f5b4a433fb28e78883b252bc6bac1473cfc3b (diff)
downloadupstream-515fa69f8f0357afe9159a718ff254cf936c754e.tar.gz
upstream-515fa69f8f0357afe9159a718ff254cf936c754e.tar.bz2
upstream-515fa69f8f0357afe9159a718ff254cf936c754e.zip
mac80211: fix possible NULL pointer dereference in ath9k
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34624 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/305-pending-ath9k-allow-to-load-EEPROM-content-via-firmware-API.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/mac80211/patches/305-pending-ath9k-allow-to-load-EEPROM-content-via-firmware-API.patch b/package/mac80211/patches/305-pending-ath9k-allow-to-load-EEPROM-content-via-firmware-API.patch
index 78efdc4e37..d710d099ef 100644
--- a/package/mac80211/patches/305-pending-ath9k-allow-to-load-EEPROM-content-via-firmware-API.patch
+++ b/package/mac80211/patches/305-pending-ath9k-allow-to-load-EEPROM-content-via-firmware-API.patch
@@ -144,7 +144,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
ath_read_cachesize(common, &csz);
common->cachelsz = csz << 2; /* convert to bytes */
-+ if (pdata->eeprom_name) {
++ if (pdata && pdata->eeprom_name) {
+ ret = ath9k_eeprom_request(sc, pdata->eeprom_name);
+ if (ret)
+ goto err_eeprom;