[RFC] mac80211: prevent authentication on channel mismatch w/ hw conf

[RFC] mac80211: prevent authentication on channel mismatch w/ hw conf

[Rajkumar Manoharan]

Do not proceed authentication if hw was already configured
with one of the vif's channel which is differed with requesting
channel. Not doing so is causing unneccesary dissociation.
This issue was originaly found while testing concurrent mode
with p2p vif.

Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
---
 net/mac80211/mlme.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 64d92d5..dcf3d6f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2282,11 +2282,30 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
 {
 	const u8 *ssid;
 	struct ieee80211_work *wk;
+	struct ieee80211_sub_if_data *ifdata;
+	bool found = false;
 	u16 auth_alg;
 
 	if (req->local_state_change)
 		return 0; /* no need to update mac80211 state */
 
+	/*
+	 * XXX: hw conf check should be removed, once the multiple
+	 * channels are supported by mac80211
+	 */
+	mutex_lock(&sdata->local->iflist_mtx);
+	list_for_each_entry(ifdata, &sdata->local->interfaces, list) {
+		if (ifdata->vif.bss_conf.enable_beacon ||
+		    ifdata->vif.bss_conf.assoc) {
+			found = true;
+			break;
+		}
+	}
+	mutex_unlock(&sdata->local->iflist_mtx);
+
+	if (found && (sdata->local->hw.conf.channel != req->bss->channel))
+		return -EOPNOTSUPP;
+
 	switch (req->auth_type) {
 	case NL80211_AUTHTYPE_OPEN_SYSTEM:
 		auth_alg = WLAN_AUTH_OPEN;
-- 
1.7.4.2

Re: [RFC] mac80211: prevent authentication on channel mismatch w/ hw conf

[Johannes Berg]

On Mon, 2011-04-04 at 22:54 +0530, Rajkumar Manoharan wrote:
> Do not proceed authentication if hw was already configured
> with one of the vif's channel which is differed with requesting
> channel. Not doing so is causing unneccesary dissociation.
> This issue was originaly found while testing concurrent mode
> with p2p vif.

This will break any kind of pre-authentication, no?

johannes

Re: [RFC] mac80211: prevent authentication on channel mismatch w/ hw conf

[Rajkumar Manoharan]

On Mon, Apr 04, 2011 at 11:46:43PM +0530, Johannes Berg wrote:
> On Mon, 2011-04-04 at 22:54 +0530, Rajkumar Manoharan wrote:
> > Do not proceed authentication if hw was already configured
> > with one of the vif's channel which is differed with requesting
> > channel. Not doing so is causing unneccesary dissociation.
> > This issue was originaly found while testing concurrent mode
> > with p2p vif.
> 
> This will break any kind of pre-authentication, no?
>
Yeah...I completely ignored roaming part. sorry for that and thanks for pointing out.
Is that fine to proceed authentication in case of matching ssid found in any of the vif's
bss and having such vif iteration under auth. Please help me to sort out.

--
Rajkumar

Re: [RFC] mac80211: prevent authentication on channel mismatch w/ hw conf

[Johannes Berg]

On Tue, 2011-04-05 at 20:48 +0530, Rajkumar Manoharan wrote:
> On Mon, Apr 04, 2011 at 11:46:43PM +0530, Johannes Berg wrote:
> > On Mon, 2011-04-04 at 22:54 +0530, Rajkumar Manoharan wrote:
> > > Do not proceed authentication if hw was already configured
> > > with one of the vif's channel which is differed with requesting
> > > channel. Not doing so is causing unneccesary dissociation.
> > > This issue was originaly found while testing concurrent mode
> > > with p2p vif.
> > 
> > This will break any kind of pre-authentication, no?
> >
> Yeah...I completely ignored roaming part. sorry for that and thanks for pointing out.
> Is that fine to proceed authentication in case of matching ssid found in any of the vif's
> bss and having such vif iteration under auth. Please help me to sort out.

You could also pre-auth if it's a different network if you like ...

What's the problem anyway?

johannes