Attachment 224811 Details for Bug 324191 – parse-elems-trunk-junk.patch

[patch] parse-elems-trunk-junk.patch

parse-elems-trunk-junk.patch (text/plain), 1.31 KB, created by John W. Linville on 2007-10-11 21:18:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. Linville

Created: 2007-10-11 21:18:03 UTC

Size: 1.31 KB

patch

obsolete

>diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c
>--- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig	2007-10-11 16:58:40.000000000 -0400
>+++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c	2007-10-11 17:10:01.000000000 -0400
>@@ -130,20 +130,12 @@ static enum ParseRes ieee802_11_parse_el
> 
> 	while (left >= 2) {
> 		u8 id, elen;
>+		bool elem_unknown;
> 
> 		id = *pos++;
> 		elen = *pos++;
> 		left -= 2;
>-
>-		if (elen > left) {
>-#if 0
>-			if (net_ratelimit())
>-				printk(KERN_DEBUG "IEEE 802.11 element parse "
>-				       "failed (id=%d elen=%d left=%d)\n",
>-				       id, elen, left);
>-#endif
>-			return ParseFailed;
>-		}
>+		elem_unknown = false;
> 
> 		switch (id) {
> 		case WLAN_EID_SSID:
>@@ -249,11 +241,26 @@ static enum ParseRes ieee802_11_parse_el
> 				      id, elen);
> #endif
> 			unknown++;
>+			elem_unknown = true;
> 			break;
> 		}
> 
>-		left -= elen;
>-		pos += elen;
>+		if (elen > left)
>+			if (elem_unknown)
>+				left = 0;
>+			else {
>+#if 0
>+				if (net_ratelimit())
>+					printk(KERN_DEBUG "IEEE 802.11 element parse "
>+					       "failed (id=%d elen=%d left=%d)\n",
>+					       id, elen, left);
>+#endif
>+				return ParseFailed;
>+			}
>+		else {
>+			left -= elen;
>+			pos += elen;
>+		}
> 	}
> 
> 	/* Do not trigger error if left == 1 as Apple Airport base stations

Actions: View | Diff

Attachments on bug 324191: 223561 | 224811