From: Simon Wunderlich Date: Wed, 23 Jan 2013 14:15:57 +0000 (+0100) Subject: cfg80211: fix channel check in cfg80211_can_use_iftype_chan X-Git-Tag: v3.9-rc1~139^2~31^2^2~80^2~33 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=683d41ae6755e6ae297ec09603c229795ab9566e;p=~emulex%2Finfiniband.git 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: Simon Wunderlich Signed-off-by: Johannes Berg --- diff --git a/net/wireless/util.c b/net/wireless/util.c index 1c2795d52db..d7873c7ae0e 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1212,7 +1212,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev, case NL80211_IFTYPE_MESH_POINT: case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_WDS: - radar_required = !!(chan->flags & IEEE80211_CHAN_RADAR); + radar_required = !!(chan && + (chan->flags & IEEE80211_CHAN_RADAR)); break; case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_STATION: