]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
mac80211: move WEP tailroom size check
authorJanusz Dziedzic <janusz.dziedzic@tieto.com>
Mon, 11 May 2015 09:31:15 +0000 (11:31 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 3 Jun 2015 09:33:13 +0000 (11:33 +0200)
commitaee7e03ec16673bbd0710144da6295ff1fec1bb9
tree57a0e6d0932dc722b038390d13980d0ef0e09cbb
parent0f5a0fcfc6d8ca5d6ad53bbfef32f8b69db60ce9
mac80211: move WEP tailroom size check

commit 47b4e1fc4972cc43a19121bc2608a60aef3bf216 upstream.

Remove checking tailroom when adding IV as it uses only
headroom, and move the check to the ICV generation that
actually needs the tailroom.

In other case I hit such warning and datapath don't work,
when testing:
- IBSS + WEP
- ath9k with hw crypt enabled
- IPv6 data (ping6)

WARNING: CPU: 3 PID: 13301 at net/mac80211/wep.c:102 ieee80211_wep_add_iv+0x129/0x190 [mac80211]()
[...]
Call Trace:
[<ffffffff817bf491>] dump_stack+0x45/0x57
[<ffffffff8107746a>] warn_slowpath_common+0x8a/0xc0
[<ffffffff8107755a>] warn_slowpath_null+0x1a/0x20
[<ffffffffc09ae109>] ieee80211_wep_add_iv+0x129/0x190 [mac80211]
[<ffffffffc09ae7ab>] ieee80211_crypto_wep_encrypt+0x6b/0xd0 [mac80211]
[<ffffffffc09d3fb1>] invoke_tx_handlers+0xc51/0xf30 [mac80211]
[...]

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/mac80211/wep.c