diff options
| author | bibhayr <bibhayr@nvidia.com> | 2014-06-30 11:13:18 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-10 02:05:25 -0700 |
| commit | 1776b8cf2a113ca464deca53e9cb19d0a454bcb7 (patch) | |
| tree | be6576e0fbec8ad10c0c135d03b515b8a2b168a3 | |
| parent | 534729fd8761695b7dafd3a5c81e710f18002b44 (diff) | |
bcmdhd: check null pointer in cfg80211 callbacks
move the null pointer check before using it.
Bug 200015171
Change-Id: I669b62f2448cc515f67401df046a1d57638d8144
Signed-off-by: bibhayr <bibhayr@nvidia.com>
Reviewed-on: http://git-master/r/432834
(cherry picked from commit b33e2518db4411a7d1e89b9b116ae038ef4ed55e)
Reviewed-on: http://git-master/r/435726
GVS: Gerrit_Virtual_Submit
Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com>
Tested-by: Anshul Jain (SW) <anshulj@nvidia.com>
| -rwxr-xr-x | drivers/net/wireless/bcmdhd/wl_cfgp2p.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c index 9e8331ca236d..588dd832baca 100755 --- a/drivers/net/wireless/bcmdhd/wl_cfgp2p.c +++ b/drivers/net/wireless/bcmdhd/wl_cfgp2p.c @@ -1062,15 +1062,16 @@ wl_cfgp2p_set_management_ie(struct wl_priv *wl, struct net_device *ndev, s32 bss u8 *ptr; s32 type = -1; s32 remained_buf_len; + + if (!wl) + return ERR_PTR(-EINVAL); + #define IE_TYPE(type, bsstype) (wl_to_p2p_bss_saved_ie(wl, bsstype).p2p_ ## type ## _ie) #define IE_TYPE_LEN(type, bsstype) (wl_to_p2p_bss_saved_ie(wl, bsstype).p2p_ ## type ## _ie_len) 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)); |