diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-01-16 21:47:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:10:43 -0800 |
| commit | f99b751fca5b16bea53c0d6724935e1949350052 (patch) | |
| tree | 82d85bd1be31261b9c6b9b4b8926c3f52a21c656 | |
| parent | bfe6a50156ab0c33729378fae7038bce3c6c5184 (diff) | |
| download | kernel-crypto-f99b751fca5b16bea53c0d6724935e1949350052.tar.gz kernel-crypto-f99b751fca5b16bea53c0d6724935e1949350052.tar.xz kernel-crypto-f99b751fca5b16bea53c0d6724935e1949350052.zip | |
mac80211: fix RCU locking in __ieee80211_rx_handle_packet
Commit c7a51bda ("mac80211: restructure __ieee80211_rx") extracted
__ieee80211_rx_handle_packet out of __ieee80211_rx and hence changed
the locking rules for __ieee80211_rx_handle_packet(), it is now
invoked under RCU lock. There is, however, one instance left where
it contains an rcu_read_unlock() in an error path, which is a bug.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/rx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 465fce0f62a..96b0faf40b1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1730,7 +1730,6 @@ void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, struct sk_buff *skb, ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx, rx.sta); sta_info_put(sta); - rcu_read_unlock(); return; } |