linux-toradex.git/net/mac80211/key.c, branch v3.0.98

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

mac80211: Skip tailroom reservation for full HW-crypto devices

2011-04-28T18:53:21+00:00

In xmit path, devices that do full hardware crypto (including
TKIP MMIC) 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.

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

mac80211: fix possible NULL pointer dereference

2011-03-28T19:42:02+00:00

This patch moves 'key' dereference after BUG_ON(!key) so that when key is NULL
we will see proper trace instead of oops.

Signed-off-by: Mariusz Kozlowski 
Acked-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: fix NULL pointer dereference in ieee80211_key_alloc()

2011-03-28T19:42:02+00:00

The ieee80211_key struct can be kfree()d several times in the function, for
example if some of the key setup functions fails beforehand, but there's no
check if the struct is still valid before we call memcpy() and INIT_LIST_HEAD()
on it.  In some cases (like it was in my case), if there's missing aes-generic
module it could lead to the following kernel OOPS:

	Unable to handle kernel NULL pointer dereference at virtual address 0000018c
	....
	PC is at memcpy+0x80/0x29c
	...
	Backtrace:
	[] (ieee80211_key_alloc+0x0/0x234 [mac80211]) from [] (ieee80211_add_key+0x70/0x12c [mac80211])
	[] (ieee80211_add_key+0x0/0x12c [mac80211]) from [] (__cfg80211_set_encryption+0x2a8/0x464 [cfg80211])

Signed-off-by: Petr Štetiar 
Reviewed-by: Johannes Berg 
Signed-off-by: John W. Linville

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2011-01-05T19:35:41+00:00

mac80211: fix some key comments and code

2011-01-04T19:46:14+00:00

The key documentation is slightly out of date, fix
that. Also, the list entry in the key struct is no
longer used that way, so list_del_init() isn't
necessary any more there.

Finally, ieee80211_key_link() is no longer invoked
under RCU read lock, but rather with an appropriate
station lock held.

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

mac80211: add missing synchronize_rcu

2011-01-04T19:17:23+00:00

commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2
Author: Johannes Berg 
Date:   Tue Jun 1 10:19:19 2010 +0200

    mac80211: simplify key locking

removed the synchronization against RCU and thus
opened a race window where we can use a key for
TX while it is already freed. Put a synchronisation
into the right place to close that window.

Reported-by: Jussi Kivilinna 
Cc: stable@kernel.org [2.6.36+]
Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville