Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db3aaba authored by Michael Skeffington's avatar Michael Skeffington Committed by Kalle Valo
Browse files

rt2x00: Fix MMIC Countermeasures 



Set RX_FLAG_DECRYPTED in case of MMIC failure so that
ieee80211_rx_h_decrypt() doesnt drop the frame before getting to
ieee80211_rx_h_michael_mic_verify().

Signed-off-by: default avatarMichael Skeffington <mike@astro.ai>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent cb1b8262

drivers/net/wireless/ralink/rt2x00/rt2800mmio.c

+11 −2
Original line number Diff line number Diff line
@@ -136,11 +136,20 @@ void rt2800mmio_fill_rxdone(struct queue_entry *entry, 
		 */

		rxdesc->flags |= RX_FLAG_MMIC_STRIPPED;



		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)

		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS) {

			rxdesc->flags |= RX_FLAG_DECRYPTED;

		else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)

		} else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC) {

			/*

			 * In order to check the Michael Mic, the packet must have

			 * been decrypted.  Mac80211 doesnt check the MMIC failure 

			 * flag to initiate MMIC countermeasures if the decoded flag

			 * has not been set.

			 */

			rxdesc->flags |= RX_FLAG_DECRYPTED;



			rxdesc->flags |= RX_FLAG_MMIC_ERROR;

		}

	}



	if (rt2x00_get_field32(word, RXD_W3_MY_BSS))

		rxdesc->dev_flags |= RXDONE_MY_BSS;

drivers/net/wireless/ralink/rt2x00/rt2800usb.c

+12 −3
Original line number Diff line number Diff line
@@ -698,11 +698,20 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry, 
		 */

		rxdesc->flags |= RX_FLAG_MMIC_STRIPPED;

        

		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)

		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS) {

			rxdesc->flags |= RX_FLAG_DECRYPTED;

		else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)

		} else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC) {

			/*

			 * In order to check the Michael Mic, the packet must have

			 * been decrypted.  Mac80211 doesnt check the MMIC failure 

			 * flag to initiate MMIC countermeasures if the decoded flag

			 * has not been set.

			 */

			rxdesc->flags |= RX_FLAG_DECRYPTED;



			rxdesc->flags |= RX_FLAG_MMIC_ERROR;

		}

	}



	if (rt2x00_get_field32(word, RXD_W0_MY_BSS))

		rxdesc->dev_flags |= RXDONE_MY_BSS;