]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mac80211: fix two remote exploits
authorJohannes Berg <johannes@sipsolutions.net>
Fri, 20 Nov 2009 08:15:51 +0000 (09:15 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Nov 2009 18:52:21 +0000 (13:52 -0500)
commit4253119acf412fd686ef4bd8749b5a4d70ea3a51
tree44dc3e4ea5a6c2eb21a0e0c04de1c04e1662549d
parent3e9848403ad59c53b31facb30b43ca80135ae0b9
mac80211: fix two remote exploits

Lennert Buytenhek noticed a remotely triggerable problem
in mac80211, which is due to some code shuffling I did
that ended up changing the order in which things were
done -- this was in

  commit d75636ef9c1af224f1097941879d5a8db7cd04e5
  Author: Johannes Berg <johannes@sipsolutions.net>
  Date:   Tue Feb 10 21:25:53 2009 +0100

    mac80211: RX aggregation: clean up stop session

The problem is that the BUG_ON moved before the various
checks, and as such can be triggered.

As the comment indicates, the BUG_ON can be removed since
the ampdu_action callback must already exist when the
state is OPERATIONAL.

A similar code path leads to a WARN_ON in
ieee80211_stop_tx_ba_session, which can also be removed.

Cc: stable@kernel.org [2.6.29+]
Cc: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c