Changeset 2736

Timestamp:

10/11/07 17:40:49 (1 year ago)

Author:

mentor

Message:

If a rates information element is received that is larger than we will accept, simply take the first maximum size elements and continue, rather than BUG'ing out.

Files:

• madwifi/trunk/net80211/_ieee80211.h (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_scan_ap.c (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_scan_sta.c (modified) (1 diff)

madwifi/trunk/net80211/_ieee80211.h

@@ -226 +226 @@
-#define IEEE80211_RATE_SIZE     8               /* 802.11 standard */
-#define IEEE80211_RATE_MAXSIZE  15              /* max rates we'll handle */
+#define IEEE80211_SANITISE_RATESIZE(_rsz) \
+        ((_rsz > IEEE80211_RATE_MAXSIZE) ? IEEE80211_RATE_MAXSIZE : _rsz)
-
-struct ieee80211_rateset {

madwifi/trunk/net80211/ieee80211_scan_ap.c

@@ -512 +512 @@
-        TAILQ_INSERT_TAIL(&as->as_entry, se, se_list);
-        LIST_INSERT_HEAD(&as->as_hash[hash], se, se_hash);
+
-found:
-        ise = &se->base;
-
-
-
-
+
+
+
+
+
-                memcpy(ise->se_ssid, sp->ssid, 2 + sp->ssid[1]);
-
-
-
-
+
+
+
-        if (sp->xrates != NULL) {
-
-
-
-
+
+
-        } else
-                ise->se_xrates[1] = 0;
+
-        IEEE80211_ADDR_COPY(ise->se_bssid, wh->i_addr3);
-
-
-
-
+
+
+
-                se->se_avgrssi = RSSI_IN(rssi);
-avg
+Avg.
-                RSSI_LPF(se->se_avgrssi, rssi);
-        se->base.se_rssi = RSSI_GET(se->se_avgrssi);

madwifi/trunk/net80211/ieee80211_scan_sta.c

@@ -248 +248 @@
-        TAILQ_INSERT_TAIL(&st->st_entry, se, se_list);
-        LIST_INSERT_HEAD(&st->st_hash[hash], se, se_hash);
+
-found:
-        ise = &se->base;
+
-        /* XXX ap beaconing multiple ssid w/ same bssid */
-        if (sp->ssid[1] != 0 &&
-            (ISPROBE(subtype) || ise->se_ssid[1] == 0))
-                memcpy(ise->se_ssid, sp->ssid, 2 + sp->ssid[1]);
-
-       ("rate set too large: %u", sp->rates[1]));
-memcpy(ise->se_rates, sp->rates, 2 + sp->rates[1]
+
+memcpy(ise->se_rates, sp->rates, 
+               2 + IEEE80211_SANITISE_RATESIZE(sp->rates[1])
-        if (sp->xrates != NULL) {
-
-
-
-
+
+
-        } else
-                ise->se_xrates[1] = 0;
+
-        IEEE80211_ADDR_COPY(ise->se_bssid, wh->i_addr3);
-        /*