From: Pontus Fuchs <pontus.fuchs@gmail.com>
To: johannes@sipsolutions.net, linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, Pontus Fuchs <pontus.fuchs@gmail.com>
Subject: [PATCH] mac80211: Disallow changing chan type on monitor when CHAN_MODE_FIXED
Date: Tue, 12 Jun 2012 13:06:07 +0200 [thread overview]
Message-ID: <1339499167-26225-1-git-send-email-pontus.fuchs@gmail.com> (raw)
If you add a monitor interface in paralell to a normal interface
mac80211 will let you to change the channel type on the monitor
interface even if you are connected. Add an explicit check to
disallow this.
Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
---
net/mac80211/cfg.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 498c94e..9f673bf 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -677,7 +677,8 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
static int ieee80211_set_channel(struct wiphy *wiphy,
struct net_device *netdev,
struct ieee80211_channel *chan,
- enum nl80211_channel_type channel_type)
+ enum nl80211_channel_type channel_type,
+ bool is_monitor)
{
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = NULL;
@@ -689,7 +690,8 @@ static int ieee80211_set_channel(struct wiphy *wiphy,
case CHAN_MODE_HOPPING:
return -EBUSY;
case CHAN_MODE_FIXED:
- if (local->oper_channel != chan)
+ if (local->oper_channel != chan ||
+ (is_monitor && local->_oper_channel_type != channel_type))
return -EBUSY;
if (!sdata && local->_oper_channel_type == channel_type)
return 0;
@@ -713,7 +715,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type)
{
- return ieee80211_set_channel(wiphy, NULL, chan, channel_type);
+ return ieee80211_set_channel(wiphy, NULL, chan, channel_type, true);
}
static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata,
@@ -831,7 +833,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
return -EALREADY;
err = ieee80211_set_channel(wiphy, dev, params->channel,
- params->channel_type);
+ params->channel_type, false);
if (err)
return err;
@@ -1607,7 +1609,7 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,
return err;
err = ieee80211_set_channel(wiphy, dev, setup->channel,
- setup->channel_type);
+ setup->channel_type, false);
if (err)
return err;
--
1.7.5.4
next reply other threads:[~2012-06-12 11:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-12 11:06 Pontus Fuchs [this message]
2012-06-12 11:08 ` [PATCH] mac80211: Disallow changing chan type on monitor when CHAN_MODE_FIXED Johannes Berg
2012-06-12 11:20 ` Pontus Fuchs
2012-06-12 11:33 ` Johannes Berg
2012-06-12 12:15 ` Pontus Fuchs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339499167-26225-1-git-send-email-pontus.fuchs@gmail.com \
--to=pontus.fuchs@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).