[PATCH] d80211: Reinit keys on mode change

[PATCH] d80211: Reinit keys on mode change

[Jan Kiszka]

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

Switching the interface mode with some encryption keys set and then later
touching any key, triggers an oops because ieee80211_if_reinit fails to
NULL'ify the related pointers after free'ing the key on mode change. Long
explanation, simple fix below.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>

[Sorry, yet another rt2x00 CVS patch...]

---
 ieee80211/ieee80211_iface.c |    1 +
 1 file changed, 1 insertion(+)

Index: rt2x00/ieee80211/ieee80211_iface.c
===================================================================
--- rt2x00.orig/ieee80211/ieee80211_iface.c
+++ rt2x00/ieee80211/ieee80211_iface.c
@@ -231,6 +231,7 @@ void ieee80211_if_reinit(struct net_devi
 					    local->keys[i], 0);
 #endif
 		ieee80211_key_free(sdata->keys[i]);
+		sdata->keys[i] = NULL;
 	}
 
 	/* Shouldn't be necessary but won't hurt */



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

Re: [PATCH] d80211: Reinit keys on mode change

[Ivo Van Doorn]

On 1/1/07, Jan Kiszka <jan.kiszka@web.de> wrote:
> Switching the interface mode with some encryption keys set and then later
> touching any key, triggers an oops because ieee80211_if_reinit fails to
> NULL'ify the related pointers after free'ing the key on mode change. Long
> explanation, simple fix below.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
>
> [Sorry, yet another rt2x00 CVS patch...]

To make it easier for everybody, here is the same patch
only this time applied to the dscape git tree. ;)

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>

---

diff --git a/net/d80211/ieee80211_iface.c b/net/d80211/ieee80211_iface.c
index 3e9d531..7d4ec56 100644
--- a/net/d80211/ieee80211_iface.c
+++ b/net/d80211/ieee80211_iface.c
@@ -229,6 +229,7 @@ void ieee80211_if_reinit(struct net_device *dev)
 					   local->keys[i], 0);
 #endif
 		ieee80211_key_free(sdata->keys[i]);
+		sdata->keys[i] = NULL;
 	}

 	/* Shouldn't be necessary but won't hurt */