diff options
| author | Allen Yu <alleny@nvidia.com> | 2014-07-06 20:10:15 +0800 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-10 02:05:39 -0700 |
| commit | 50c7686f0cd0d061ca538d4e84c30f1c044193d7 (patch) | |
| tree | 84c6f17a3ef01c27b7028f59c46203ab7e78c09d | |
| parent | 53a3c99b2d2e0e68a1cbb933a837be686c8b087d (diff) | |
bcmdhd: fix NULL pointer in setting IEs
In case of device role undetermined, we should return error instread of
going ahead to set IEs to FW, which could potentially cause a NULL poiter
issue.
Bug 200015171
Change-Id: I2dd1828d6ad87845d3b0ed5bfeaffad6fe728a1f
Signed-off-by: Allen Yu <alleny@nvidia.com>
Reviewed-on: http://git-master/r/434900
(cherry picked from commit 79936ac3b2a0069af2b55ec84ed44c86fc8fce17)
Reviewed-on: http://git-master/r/435737
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_cfg80211.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index c443e7316cc2..091fe3670f85 100755 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -6280,6 +6280,12 @@ wl_cfg80211_change_beacon( dev_role = NL80211_IFTYPE_P2P_GO; } + if (dev_role == 0) { + WL_ERR(("Unknown device role!\n")); + err = BCME_ERROR; + goto fail; + } + if (!check_dev_role_integrity(wl, dev_role)) goto fail; @@ -6351,6 +6357,12 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, dev_role = NL80211_IFTYPE_P2P_GO; } + if (dev_role == 0) { + WL_ERR(("Unknown device role!\n")); + err = BCME_ERROR; + goto fail; + } + if (!check_dev_role_integrity(wl, dev_role)) goto fail; |