summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Luban <mluban@nvidia.com>2014-06-29 16:36:32 -0700
committerMandar Padmawar <mpadmawar@nvidia.com>2014-07-10 02:05:24 -0700
commit534729fd8761695b7dafd3a5c81e710f18002b44 (patch)
treee40e51af3ed7ee079a517ef3dd933475c0a445bf
parentbb5d260a38bb464f92876f68b7ce43d0e9c77cff (diff)
bcmdhd: check null pointer in cfg80211 callbacks
Bug 200015171 Change-Id: I341dd59845ae981ba1aeb7a6229cc83c37322443 Signed-off-by: Mitch Luban <mluban@nvidia.com> Reviewed-on: http://git-master/r/432559 (cherry picked from commit 99ef142403e3c7203febd174f0c533f9d72c245b) Reviewed-on: http://git-master/r/435725 GVS: Gerrit_Virtual_Submit Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com> Tested-by: Anshul Jain (SW) <anshulj@nvidia.com>
-rwxr-xr-xdrivers/net/wireless/bcmdhd/wl_cfgp2p.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
index 2a8054452e47..9e8331ca236d 100755
--- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c
@@ -1067,6 +1067,10 @@ wl_cfgp2p_set_management_ie(struct wl_priv *wl, struct net_device *ndev, s32 bss
memset(g_mgmt_ie_buf, 0, sizeof(g_mgmt_ie_buf));
curr_ie_buf = g_mgmt_ie_buf;
CFGP2P_DBG((" bssidx %d, pktflag : 0x%02X\n", bssidx, pktflag));
+
+ if (!wl)
+ return ERR_PTR(-EINVAL);
+
if (wl->p2p != NULL) {
if (wl_cfgp2p_find_type(wl, bssidx, &type)) {
CFGP2P_ERR(("cannot find type from bssidx : %d\n", bssidx));