add two patches from madwifi trac ticket 914 - should fix multiple wlanconfig create/destroy runs and a few wds related crashes

SVN-Revision: 5865
This commit is contained in:
Felix Fietkau 2006-12-19 22:52:16 +00:00
parent 96601237fb
commit 0d9508a09d
2 changed files with 65 additions and 0 deletions

View File

@ -0,0 +1,22 @@
Doing ifconfig athX down/ifconfig athX up several times provokes kernel crash.
See http://madwifi.org/ticket/914. But if ath_hal_phydisable() is skipped -
I observe NO CRASH whatsoever ... :\ Weird.
Signed-off-by: Mindaugas Kriaučiūnas <mindaugas.kriauciunas@gmail.com>
Signed-off-by: Žilvinas Valinskas <valins@soften.ktu.lt>
Index: madwifi-ng-trunk/ath/if_ath.c
===================================================================
--- madwifi-ng-trunk.orig/ath/if_ath.c 2006-10-16 17:40:50.000000000 +0300
+++ madwifi-ng-trunk/ath/if_ath.c 2006-10-18 16:17:32.000000000 +0300
@@ -1997,7 +1997,10 @@
ath_draintxq(sc);
if (!sc->sc_invalid) {
ath_stoprecv(sc);
+
+ /* XXX: this helps to avoid crashes on ifconfig down/up
ath_hal_phydisable(ah);
+ */
} else
sc->sc_rxlink = NULL;
ath_beacon_free(sc); /* XXX needed? */

View File

@ -0,0 +1,43 @@
WDS related crash is observed. This causes by possible random memory
writes/accesss. Note how wds is freed, yet it will be used further in
loop ...
Other usages in the tree of LIST_FOREACH() when element is found and
acted up on element, loop is immediately break (either via break, or
return). But not in this case ...
Signed-off-by: Mindaugas Kriaučiūnas <mindaugas.kriauciunas@gmail.com>
Signed-off-by: Žilvinas Valinskas <valins@soften.ktu.lt>
Index: madwifi-ng-trunk/net80211/ieee80211_node.c
===================================================================
--- madwifi-ng-trunk.orig/net80211/ieee80211_node.c 2006-09-25 13:28:08.000000000 +0300
+++ madwifi-ng-trunk/net80211/ieee80211_node.c 2006-10-18 15:59:40.000000000 +0300
@@ -961,11 +961,11 @@
ieee80211_del_wds_node(struct ieee80211_node_table *nt, struct ieee80211_node *ni)
{
int hash;
- struct ieee80211_wds_addr *wds;
+ struct ieee80211_wds_addr *wds, *next;
IEEE80211_NODE_LOCK_IRQ(nt);
for (hash = 0; hash < IEEE80211_NODE_HASHSIZE; hash++) {
- LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) {
+ LIST_FOREACH_SAFE(wds, &nt->nt_wds_hash[hash], wds_hash, next) {
if (wds->wds_ni == ni) {
if (ieee80211_node_dectestref(ni)) {
_ieee80211_free_node(ni);
@@ -984,11 +984,11 @@
{
struct ieee80211_node_table *nt = (struct ieee80211_node_table *)data;
int hash;
- struct ieee80211_wds_addr *wds;
+ struct ieee80211_wds_addr *wds, *next;
IEEE80211_NODE_LOCK_IRQ(nt);
for (hash = 0; hash < IEEE80211_NODE_HASHSIZE; hash++) {
- LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) {
+ LIST_FOREACH_SAFE(wds, &nt->nt_wds_hash[hash], wds_hash, next) {
if (wds->wds_agingcount != WDS_AGING_STATIC) {
if (!wds->wds_agingcount) {
if (ieee80211_node_dectestref(wds->wds_ni)) {