From 79936ac3b2a0069af2b55ec84ed44c86fc8fce17 Mon Sep 17 00:00:00 2001 From: Allen Yu Date: Sun, 6 Jul 2014 20:10:15 +0800 Subject: [PATCH] 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 Reviewed-on: http://git-master/r/434900 Reviewed-by: Robert Shih GVS: Gerrit_Virtual_Submit Reviewed-by: Om Prakash Singh Reviewed-by: Kevin Bruckert Tested-by: Kevin Bruckert Reviewed-by: Chas Inman --- drivers/net/wireless/bcmdhd/wl_cfg80211.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 6cfc293c13d..5baaf63c714 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -6278,6 +6278,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; @@ -6349,6 +6355,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; -- 2.39.2