Commit e1352fde authored Aug 10, 2012 by Lorenzo Bianconi Committed by John W. Linville Aug 13, 2012

ath9k: fix decrypt_error initialization in ath_rx_tasklet()



ath_rx_tasklet() calls ath9k_rx_skb_preprocess() and ath9k_rx_skb_postprocess()
in a loop over the received frames. The decrypt_error flag is
initialized to false
just outside ath_rx_tasklet() loop. ath9k_rx_accept(), called by
ath9k_rx_skb_preprocess(),
only sets decrypt_error to true and never to false.
Then ath_rx_tasklet() calls ath9k_rx_skb_postprocess() and passes
decrypt_error to it.
So, after a decryption error, in ath9k_rx_skb_postprocess(), we can
have a leftover value
from another processed frame. In that case, the frame will not be marked with
RX_FLAG_DECRYPTED even if it is decrypted correctly.
When using CCMP encryption this issue can lead to connection stuck
because of CCMP
PN corruption and a waste of CPU time since mac80211 tries to decrypt an already
deciphered frame with ieee80211_aes_ccm_decrypt.
Fix the issue initializing decrypt_error flag at the begging of the
ath_rx_tasklet() loop.

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent e19f15ac

drivers/net/wireless/ath/ath9k/recv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
		struct ieee80211_hw *hw = sc->hw;
		struct ieee80211_hdr *hdr;
		int retval;
		bool decrypt_error = false;
		struct ath_rx_status rs;
		enum ath9k_rx_qtype qtype;
		bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
		@@ -1066,6 +1065,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
		tsf_lower = tsf & 0xffffffff;

		do {
		bool decrypt_error = false;
		/* If handling rx interrupt and flush is in progress => exit */
		if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
		break;