[PATCH v6 4/4] cfg80211: correctly check ad-hoc channels

2014-12-01 Thread Arik Nemtsov
Ad-hoc requires beaconing for regulatory purposes. Validate that the
channel is valid for beaconing, and not only enabled.

Signed-off-by: Arik Nemtsov 
---
Ilan Peer mentioned this bug privately, so I thought I'd roll it up into
this patch-set

 net/wireless/reg.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index c3e6f80..004ea14 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1552,9 +1552,15 @@ static bool reg_wdev_chan_valid(struct wiphy *wiphy, 
struct wireless_dev *wdev)
ret = cfg80211_reg_can_beacon(wiphy,
  &wdev->chandef, wdev->iftype);
break;
+   case NL80211_IFTYPE_ADHOC:
+   if (!wdev->ssid_len)
+   goto out;
+
+   ret = cfg80211_reg_can_beacon(wiphy,
+ &wdev->chandef, wdev->iftype);
+   break;
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
-   case NL80211_IFTYPE_ADHOC:
if (!wdev->current_bss ||
!wdev->current_bss->pub.channel)
goto out;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v6 4/4] cfg80211: correctly check ad-hoc channels

2014-12-01 Thread Luis R. Rodriguez
On Mon, Dec 01, 2014 at 05:48:47PM +0200, Arik Nemtsov wrote:
> Ad-hoc requires beaconing for regulatory purposes. Validate that the
> channel is valid for beaconing, and not only enabled.
> 
> Signed-off-by: Arik Nemtsov 

Reviewed-by: Luis R. Rodriguez 

  Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html