summaryrefslogtreecommitdiff
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2014-03-21 17:52:15 +0400
committerJohannes Berg <johannes.berg@intel.com>2014-04-09 12:55:58 +0400
commit65d26f29ec018c863ae181c96c1dd91ed8c4b652 (patch)
tree51036c3319dde4323c3110436e017482336e5e4d /net/wireless/util.c
parent5d52ee81101943c507f45c76368026935f6bb75a (diff)
downloadlinux-65d26f29ec018c863ae181c96c1dd91ed8c4b652.tar.xz
cfg80211: fix radar_detect combination checking
All bits from radar_detect must match combination radar bitmask. Otherwise it is theoretically possible to lead into an invalid combination provided a driver reports strange combinations. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r--net/wireless/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 5433659a08ee..d032a31828f1 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1309,7 +1309,7 @@ int cfg80211_check_combinations(struct wiphy *wiphy,
}
}
- if (radar_detect && !(c->radar_detect_widths & radar_detect))
+ if (radar_detect != (c->radar_detect_widths & radar_detect))
goto cont;
/* Finally check that all iftypes that we're currently