From: Greg Kroah-Hartman Date: Tue, 9 Mar 2010 00:09:18 +0000 (-0800) Subject: .33 patch X-Git-Tag: v2.6.32.10~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f14bdeb31ce626c93e4fe9ac882562fbcd106bfa;p=thirdparty%2Fkernel%2Fstable-queue.git .33 patch --- diff --git a/queue-2.6.33/ath9k-fix-keycache-leak-in-split-tkip-case.patch b/queue-2.6.33/ath9k-fix-keycache-leak-in-split-tkip-case.patch new file mode 100644 index 00000000000..4da99cc115d --- /dev/null +++ b/queue-2.6.33/ath9k-fix-keycache-leak-in-split-tkip-case.patch @@ -0,0 +1,30 @@ +From 733da37dab72de6b3f8b0c56b5cdea322f18a684 Mon Sep 17 00:00:00 2001 +From: Ming Lei +Date: Sat, 6 Feb 2010 22:38:23 +0800 +Subject: ath9k: fix keycache leak in split tkip case + +From: Ming Lei + +commit 733da37dab72de6b3f8b0c56b5cdea322f18a684 upstream. + +If split tkip key is used, ath_delete_key should delete +rx key and rx mic key. This patch fixes the leak of hw +keycache in the case. + +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath9k/main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -928,6 +928,7 @@ static void ath_key_delete(struct ath_co + + clear_bit(key->hw_key_idx + 64, common->keymap); + if (common->splitmic) { ++ ath9k_hw_keyreset(ah, key->hw_key_idx + 32); + clear_bit(key->hw_key_idx + 32, common->keymap); + clear_bit(key->hw_key_idx + 64 + 32, common->keymap); + } diff --git a/queue-2.6.33/series b/queue-2.6.33/series index 6a240b2c13b..3c9e781ffb5 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -15,3 +15,4 @@ v4l-dvb-13991-gspca_mr973010a-fix-cif-type-1-cameras-not-streaming-on-uhci-contr vfs-take-f_lock-on-modifying-f_mode-after-open-time.patch x86-uv-uv_global_gru_mmr_address-macro-fix.patch drm-i915-give-up-on-8xx-lid-status.patch +ath9k-fix-keycache-leak-in-split-tkip-case.patch