Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 477778bb authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: fix NULL pointer dereference in set_channel() 



In set_channel() callback handler, "priv" pointer is derived from
net_device. Sometimes net_device pointer coming from the stack
is NULL which causes kernel crash.
This patch fixes the problem by deriving "priv" from wiphy
when net_device pointer is NULL.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 197a4e4e

drivers/net/wireless/mwifiex/cfg80211.c

+6 −1
Original line number Diff line number Diff line
@@ -376,7 +376,12 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, 
			     struct ieee80211_channel *chan,

			     enum nl80211_channel_type channel_type)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_private *priv;



	if (dev)

		priv = mwifiex_netdev_get_priv(dev);

	else

		priv = mwifiex_cfg80211_get_priv(wiphy);



	if (priv->media_connected) {

		wiphy_err(wiphy, "This setting is valid only when station "