[PATCH] mac80211: refuse invalid interface configuration

[PATCH] mac80211: refuse invalid interface configuration

[Johannes Berg]

Refuse setting mesh_id on non-mesh or monitor flags on non-monitor
interfaces.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 net/mac80211/cfg.c |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

--- everything.orig/net/mac80211/cfg.c	2008-09-16 20:24:53.000000000 +0200
+++ everything/net/mac80211/cfg.c	2008-09-16 20:28:14.000000000 +0200
@@ -105,14 +105,21 @@ static int ieee80211_change_iface(struct
 	if (netif_running(sdata->dev))
 		return -EBUSY;
 
-	if (ieee80211_vif_is_mesh(&sdata->vif) && params->mesh_id_len)
-		ieee80211_sdata_set_mesh_id(sdata,
-					    params->mesh_id_len,
-					    params->mesh_id);
+	if (params->mesh_id_len) {
+		if (ieee80211_vif_is_mesh(&sdata->vif))
+			ieee80211_sdata_set_mesh_id(sdata,
+						    params->mesh_id_len,
+						    params->mesh_id);
+		else
+			return -EINVAL;
+	}
 
-	if (sdata->vif.type != NL80211_IFTYPE_MONITOR || !flags)
+	if (!flags)
 		return 0;
 
+	if (sdata->vif.type != NL80211_IFTYPE_MONITOR)
+		return -EINVAL;
+
 	sdata->u.mntr_flags = *flags;
 	return 0;
 }

Re: [PATCH] mac80211: refuse invalid interface configuration

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

On Tue, 2008-09-16 at 20:32 +0200, Johannes Berg wrote:
> Refuse setting mesh_id on non-mesh or monitor flags on non-monitor
> interfaces.

Hmm, know what, ignore this patch, I'll do it in cfg80211 instead.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]