2010-06-04 09:06:15

by Vivek Natarajan

Subject: [stable][PATCH] ath9k: Avoid corrupt frames being forwarded to mac80211.

If bit 29 is set, MAC H/W can attempt to decrypt the received aggregate
with WEP or TKIP, eventhough the received frame may be a CRC failed
corrupted frame. If this bit is set, H/W obeys key type in keycache.
If it is not set and if the key type in keycache is neither open nor
AES, H/W forces key type to be open. But bit 29 should be set to 1
for AsyncFIFO feature to encrypt/decrypt the aggregate with WEP or TKIP.

Reported-by: Johan Hovold <[email protected]>
Signed-off-by: Vivek Natarajan <[email protected]>
Signed-off-by: Ranga Rao Ravuri <[email protected]>
---
Applies on top of 2.6.33 and 2.6.34

drivers/net/wireless/ath/ath9k/initvals.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/initvals.h b/drivers/net/wireless/ath/ath9k/initvals.h
index 8a3bf3a..7203f00 100644
--- a/drivers/net/wireless/ath/ath9k/initvals.h
+++ b/drivers/net/wireless/ath/ath9k/initvals.h
@@ -246,7 +246,7 @@ static const u32 ar5416Common[][2] = {
{ 0x00008258, 0x00000000 },
{ 0x0000825c, 0x400000ff },
{ 0x00008260, 0x00080922 },
- { 0x00008264, 0xa8000010 },
+ { 0x00008264, 0x88000010 },
{ 0x00008270, 0x00000000 },
{ 0x00008274, 0x40000000 },
{ 0x00008278, 0x003e4180 },
@@ -2766,7 +2766,7 @@ static const u32 ar9280Common_9280_2[][2] = {
{ 0x00008258, 0x00000000 },
{ 0x0000825c, 0x400000ff },
{ 0x00008260, 0x00080922 },
- { 0x00008264, 0xa8a00010 },
+ { 0x00008264, 0x88a00010 },
{ 0x00008270, 0x00000000 },
{ 0x00008274, 0x40000000 },
{ 0x00008278, 0x003e4180 },
@@ -3936,7 +3936,7 @@ static const u_int32_t ar9285Common_9285[][2] = {
{ 0x00008258, 0x00000000 },
{ 0x0000825c, 0x400000ff },
{ 0x00008260, 0x00080922 },
- { 0x00008264, 0xa8a00010 },
+ { 0x00008264, 0x88a00010 },
{ 0x00008270, 0x00000000 },
{ 0x00008274, 0x40000000 },
{ 0x00008278, 0x003e4180 },
@@ -5073,7 +5073,7 @@ static const u_int32_t ar9287Common_9287_1_0[][2] = {
{ 0x00008258, 0x00000000 },
{ 0x0000825c, 0x400000ff },
{ 0x00008260, 0x00080922 },
- { 0x00008264, 0xa8a00010 },
+ { 0x00008264, 0x88a00010 },
{ 0x00008270, 0x00000000 },
{ 0x00008274, 0x40000000 },
{ 0x00008278, 0x003e4180 },
--
1.7.1

2010-06-05 07:21:31

by Luis R. Rodriguez

Subject: Re: [stable][PATCH] ath9k: Avoid corrupt frames being forwarded to mac80211.

On Sat, Jun 5, 2010 at 12:20 AM, Luis R. Rodriguez <[email protected]> wrote:
> On Sat, Jun 5, 2010 at 12:20 AM, Luis R. Rodriguez <[email protected]> wrote:
>> On Fri, Jun 4, 2010 at 2:06 AM, Vivek Natarajan <[email protected]> wrote:
>>> If bit 29 is set, MAC H/W can attempt to decrypt the received aggregate
>>> with WEP or TKIP, eventhough the received frame may be a CRC failed
>>> corrupted frame. If this bit is set, H/W obeys key type in keycache.
>>> If it is not set and if the key type in keycache is neither open nor
>>> AES, H/W forces key type to be open.  But bit 29 should be set to 1
>>> for AsyncFIFO feature to encrypt/decrypt the aggregate with WEP or TKIP.
>>>
>>> Reported-by: Johan Hovold <[email protected]>
>>> Signed-off-by: Vivek Natarajan <[email protected]>
>>> Signed-off-by: Ranga Rao Ravuri <[email protected]>
>>> ---
>>> Applies on top of 2.6.33 and 2.6.34
>>
>> You need to Cc: [email protected] on the commit log.
>
> Does 2.6.32 not have this issue?

If not, why not?

Luis

2010-06-05 07:21:14

by Luis R. Rodriguez

Subject: Re: [stable][PATCH] ath9k: Avoid corrupt frames being forwarded to mac80211.

On Sat, Jun 5, 2010 at 12:20 AM, Luis R. Rodriguez <[email protected]> wrote:
> On Fri, Jun 4, 2010 at 2:06 AM, Vivek Natarajan <[email protected]> wrote:
>> If bit 29 is set, MAC H/W can attempt to decrypt the received aggregate
>> with WEP or TKIP, eventhough the received frame may be a CRC failed
>> corrupted frame. If this bit is set, H/W obeys key type in keycache.
>> If it is not set and if the key type in keycache is neither open nor
>> AES, H/W forces key type to be open.  But bit 29 should be set to 1
>> for AsyncFIFO feature to encrypt/decrypt the aggregate with WEP or TKIP.
>>
>> Reported-by: Johan Hovold <[email protected]>
>> Signed-off-by: Vivek Natarajan <[email protected]>
>> Signed-off-by: Ranga Rao Ravuri <[email protected]>
>> ---
>> Applies on top of 2.6.33 and 2.6.34
>
> You need to Cc: [email protected] on the commit log.

Does 2.6.32 not have this issue?

Luis

2010-06-05 07:20:39

by Luis R. Rodriguez

Subject: Re: [stable][PATCH] ath9k: Avoid corrupt frames being forwarded to mac80211.

On Fri, Jun 4, 2010 at 2:06 AM, Vivek Natarajan <[email protected]> wrote:
> If bit 29 is set, MAC H/W can attempt to decrypt the received aggregate
> with WEP or TKIP, eventhough the received frame may be a CRC failed
> corrupted frame. If this bit is set, H/W obeys key type in keycache.
> If it is not set and if the key type in keycache is neither open nor
> AES, H/W forces key type to be open.  But bit 29 should be set to 1
> for AsyncFIFO feature to encrypt/decrypt the aggregate with WEP or TKIP.
>
> Reported-by: Johan Hovold <[email protected]>
> Signed-off-by: Vivek Natarajan <[email protected]>
> Signed-off-by: Ranga Rao Ravuri <[email protected]>
> ---
> Applies on top of 2.6.33 and 2.6.34

You need to Cc: [email protected] on the commit log.

Luis