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

Commit 683d41ae authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Johannes Berg
Browse files

cfg80211: fix channel check in cfg80211_can_use_iftype_chan 



In commit "cfg80211: check radar interface combinations" a regression
was introduced which might lead to NULL dereference if the argument
chan = NULL, which might happen in IBSS/wext case (and probably
others).

Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f68d776a

net/wireless/util.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1212,7 +1212,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev, 
	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_WDS:

	case NL80211_IFTYPE_WDS:

		radar_required = !!(chan->flags & IEEE80211_CHAN_RADAR);

		radar_required = !!(chan &&

				    (chan->flags & IEEE80211_CHAN_RADAR));

		break;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_STATION: