linux.git/net/mac80211/key.c, branch v3.1

mac80211: let key iteration get keys in install order

2011-07-15T17:38:33+00:00

ieee80211_iter_keys() currently returns keys in
the backward order they were installed in, which
is a bit confusing. Add them to the tail of the
key list to make sure iterations go in the same
order that keys were originally installed in.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: allow drivers to access key sequence counter

2011-07-08T15:42:22+00:00

In order to implement GTK rekeying, the device needs
to be able to encrypt frames with the right PN/IV and
check the PN/IV in RX frames. To be able to tell it
about all those counters, we need to be able to get
them from mac80211, this adds the required API.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: fix TKIP races, make API easier to use

2011-07-08T15:11:19+00:00

Our current TKIP code races against itself on TX
since we can process multiple packets at the same
time on different ACs, but they all share the TX
context for TKIP. This can lead to bad IVs etc.

Also, the crypto offload helper code just obtains
the P1K/P2K from the cache, and can update it as
well, but there's no guarantee that packets are
really processed in order.

To fix these issues, first introduce a spinlock
that will protect the IV16/IV32 values in the TX
context. This first step makes sure that we don't
assign the same IV multiple times or get confused
in other ways.

Secondly, change the way the P1K cache works. I
add a field "p1k_iv32" that stores the value of
the IV32 when the P1K was last recomputed, and
if different from the last time, then a new P1K
is recomputed. This can cause the P1K computation
to flip back and forth if packets are processed
out of order. All this also happens under the new
spinlock.

Finally, because there are argument differences,
split up the ieee80211_get_tkip_key() API into
ieee80211_get_tkip_p1k() and ieee80211_get_tkip_p2k()
and give them the correct arguments.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: support GTK rekey offload

2011-07-06T19:05:43+00:00

This adds the necessary mac80211 APIs to support
GTK rekey offload, mirroring the functionality
from cfg80211.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: allow driver to iterate keys

2011-07-06T19:05:41+00:00

When in suspend/wowlan, devices might implement crypto
offload differently (more features), and might require
reprogramming keys for the WoWLAN (as it is the case
for Intel devices that use another uCode image). Thus
allow the driver to iterate all keys in this context.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: Skip tailroom reservation for full HW-crypto devices with race fix

2011-07-05T19:26:50+00:00

Based on inputs from Johannes Berg 
from http://article.gmane.org/gmane.linux.kernel.wireless.general/68193
and http://article.gmane.org/gmane.linux.kernel.wireless.general/71702

In xmit path, devices that do full hardware crypto (including
MMIC and ICV) need no tailroom. For such devices, tailroom
reservation can be skipped if all the keys are programmed into
the hardware (i.e software crypto is not used for any of the
keys) and none of the keys wants software to generate Michael
MIC and IV.

v2: Added check for IV along with MMIC.
Reported-by: Fabio Rossi 
Tested-by: Fabio Rossi 
Signed-off-by: Mohammed Shafi Shajakhan 
Cc: Mohammed Shafi Shajakhan 

v3: Fixing races to avoid WARNING: at net/mac80211/wpa.c:397
    ccmp_encrypt_skb+0xc4/0x1f0
Reported-by: Andreas Hartmann 
Tested-by: Andreas Hartmann 

v4: Added links with message ID

Signed-off-by: Yogesh Ashok Powar 
Signed-off-by: John W. Linville

Revert "mac80211: Skip tailroom reservation for full HW-crypto devices"

2011-06-06T19:23:53+00:00

This reverts commit aac6af5534fade2b18682a0b9efad1a6c04c34c6.

Conflicts:

	net/mac80211/key.c

That commit has a race that causes a warning, as documented in the thread
here:

	http://marc.info/?l=linux-wireless&m=130717684914101&w=2

Signed-off-by: John W. Linville

mac80211: sparse RCU annotations

2011-05-16T18:10:41+00:00

This adds sparse RCU annotations to most of
mac80211, only the mesh code remains to be
done.

Due the the previous patches, the annotations
are pretty simple. The only thing that this
actually changes is removing the RCU usage of
key->sta in debugfs since this pointer isn't
actually an RCU-managed pointer (it only has
a single assignment done before the key even
goes live). As that is otherwise harmless, I
decided to make it part of this patch.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: make key locking clearer

2011-05-12T18:10:53+00:00

The code in ieee80211_del_key() doesn't acquire the
key_mtx properly when it dereferences the keys. It
turns out that isn't actually necessary since the
key_mtx itself seems to be redundant since all key
manipulations are done under the RTNL, but as long
as we have the key_mtx we should use it the right
way too.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: Fix a warning due to skipping tailroom reservation for IV

2011-05-05T14:57:23+00:00

The devices that require IV generation in software need tailroom
reservation  for ICVs used in TKIP or WEP encryptions.
Currently, decision to skip the tailroom reservation in the tx
path was taken only on whether driver wants MMIC to be generated
in software or not. Following patch appends IV generation check for
such decisions and fixes the following warning.

WARNING: at net/mac80211/wep.c:101 ieee80211_wep_add_iv+0x56/0xf3()
Hardware name: 64756D6
Modules linked in: ath9k ath9k_common ath9k_hw
Pid: 0, comm: swapper Tainted: G        W   2.6.39-rc5-wl
 Call Trace:
[] warn_slowpath_common+0x65/0x7a
[] ? ieee80211_wep_add_iv+0x56/0xf3
[] warn_slowpath_null+0xf/0x13
[] ieee80211_wep_add_iv+0x56/0xf3
[] ieee80211_crypto_wep_encrypt+0x63/0x88
[] ieee80211_tx_h_encrypt+0x2f/0x63
[] invoke_tx_handlers+0x93/0xe1
[] ieee80211_tx+0x4b/0x6d
[] ieee80211_xmit+0x180/0x188
[] ? ieee80211_skb_resize+0x95/0xd9
[] ieee80211_subif_start_xmit+0x64f/0x668
[] dev_hard_start_xmit+0x368/0x48c
[] sch_direct_xmit+0x4d/0x101
[] dev_queue_xmit+0x2c1/0x43f
[] ? eth_header+0x1e/0x90
[] ? eth_type_trans+0x91/0xc2
[] ? eth_rebuild_header+0x53/0x53
[] neigh_resolve_output+0x223/0x27e
[] ip_finish_output2+0x1d4/0x1fe
[] ip_finish_output+0x79/0x7d
[] T.1075+0x43/0x48
[] ip_output+0x75/0x7b
[] dst_output+0xc/0xe
[] ip_local_out+0x17/0x1a
[] ip_queue_xmit+0x2aa/0x2f8
[] ? sk_setup_caps+0x21/0x92
[] ? __tcp_v4_send_check+0x7e/0xb7
[] tcp_transmit_skb+0x6a1/0x6d7
[] ? tcp_established_options+0x20/0x8b
[] tcp_retransmit_skb+0x43a/0x527
[] tcp_retransmit_timer+0x32e/0x45d
[] tcp_write_timer+0x87/0x16c
[] run_timer_softirq+0x156/0x1f9
[] ? tcp_retransmit_timer+0x45d/0x45d
[] __do_softirq+0x97/0x14a
[] ? irq_enter+0x4d/0x4d

Cc: Yogesh Powar 
Reported-by: Fabio Rossi 
Tested-by: Fabio Rossi 
Signed-off-by: Mohammed Shafi Shajakhan 
Signed-off-by: John W. Linville