[PATCH] mac80211: fix panic when using hardware WEP

[PATCH] mac80211: fix panic when using hardware WEP

[Pavel Roskin]

57ccbb1cbe3f8e10a500ff8b9fb26dc1a542fe99 misplaced code for setting
hardware WEP keys.  Move it back.  This fixes kernel panic in b43 if WEP
is used and hardware encryption is enabled.

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 net/mac80211/wep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
index c9fd129..e7b6344 100644
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
@@ -335,10 +335,10 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
 	info->control.icv_len = WEP_ICV_LEN;
 
 	if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
-		info->control.hw_key = &tx->key->conf;
 		if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
 			return -1;
 	} else {
+		info->control.hw_key = &tx->key->conf;
 		if (tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
 			if (!ieee80211_wep_add_iv(tx->local, skb, tx->key))
 				return -1;

Re: [PATCH] mac80211: fix panic when using hardware WEP

[Johannes Berg]

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

On Mon, 2008-06-02 at 07:54 -0400, Pavel Roskin wrote:
> 57ccbb1cbe3f8e10a500ff8b9fb26dc1a542fe99 misplaced code for setting
> hardware WEP keys.  Move it back.  This fixes kernel panic in b43 if WEP
> is used and hardware encryption is enabled.

Oh wow, yes, sorry about that, and thanks for tracking it down!

> Signed-off-by: Pavel Roskin <proski@gnu.org>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
> 
>  net/mac80211/wep.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
> index c9fd129..e7b6344 100644
> --- a/net/mac80211/wep.c
> +++ b/net/mac80211/wep.c
> @@ -335,10 +335,10 @@ static int wep_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
>  	info->control.icv_len = WEP_ICV_LEN;
>  
>  	if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
> -		info->control.hw_key = &tx->key->conf;
>  		if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
>  			return -1;
>  	} else {
> +		info->control.hw_key = &tx->key->conf;
>  		if (tx->key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) {
>  			if (!ieee80211_wep_add_iv(tx->local, skb, tx->key))
>  				return -1;
> 

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