Commit 40e7462d authored by Wen Gong's avatar Wen Gong Committed by Johannes Berg
Browse files

ath10k: drop fragments with multicast DA for SDIO 



Fragmentation is not used with multicast frames. Discard unexpected
fragments with multicast DA. This fixes CVE-2020-26145.

Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049

Cc: stable@vger.kernel.org
Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarJouni Malinen <jouni@codeaurora.org>
Link: https://lore.kernel.org/r/20210511200110.9ca6ca7945a9.I1e18b514590af17c155bda86699bc3a971a8dcf4@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 65c415a1

drivers/net/wireless/ath/ath10k/htt_rx.c

+7 −2
Original line number Diff line number Diff line
@@ -2617,6 +2617,13 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt, 
	rx_desc = (struct htt_hl_rx_desc *)(skb->data + tot_hdr_len);

	rx_desc_info = __le32_to_cpu(rx_desc->info);



	hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl->fw_desc.len);



	if (is_multicast_ether_addr(hdr->addr1)) {

		/* Discard the fragment with multicast DA */

		goto err;

	}



	if (!MS(rx_desc_info, HTT_RX_DESC_HL_INFO_ENCRYPTED)) {

		spin_unlock_bh(&ar->data_lock);

		return ath10k_htt_rx_proc_rx_ind_hl(htt, &resp->rx_ind_hl, skb,
@@ -2624,8 +2631,6 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt, 
						    HTT_RX_NON_TKIP_MIC);

	}



	hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl->fw_desc.len);



	if (ieee80211_has_retry(hdr->frame_control))

		goto err;