ath11k: avoid use_after_free in ath11k_dp_rx_msdu_coalesce API
PATCH 1/1 ath11k: avoid use_after_free in ath11k_dp_rx_msdu_coalesce API
Accessing already stored first msdu data after the skb expand trigger use_after_free, since first msdu got deleted. so do the descriptor copy operation before the skb expand operation.
Signed-off-by Karthikeyan Periyasamy <[email protected]>
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +5 -5
@@ -1374,6 +1374,11 @@ static int ath11k_dp_rx_msdu_coalesce(struct ath11k *ar,skb_put (first,DP_RX_BUFFER_SIZE );skb_pull (first, buf_first_hdr_len); +/* When an MSDU spread over multiple buffers attention, MSDU_END and +* MPDU_END tlvs are valid only in the last buffer. Copy those tlvs. +*/ +ath11k_dp_rx_desc_end_tlv_copy (rxcb->rx_desc, ldesc); + space_extra = msdu_len - (buf_first_len +skb_tailroom (first));if (space_extra >0 && (pskb_expand_head (first,0 , space_extra,GFP_ATOMIC ) <0 )) {
@@ -1389,11 +1394,6 @@ static int ath11k_dp_rx_msdu_coalesce(struct ath11k *ar,return -ENOMEM ; } -/* When an MSDU spread over multiple buffers attention, MSDU_END and -* MPDU_END tlvs are valid only in the last buffer. Copy those tlvs. -*/ -ath11k_dp_rx_desc_end_tlv_copy (rxcb->rx_desc, ldesc); - rem_len = msdu_len - buf_first_len;while ((skb =__skb_dequeue (msdu_list)) !=NULL && rem_len >0 ) { rxcb =ATH11K_SKB_RXCB (skb);
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 6 lines · Karthikeyan Periyasamy
Accessing already stored first msdu data after the skb expand trigger
use_after_free, since first msdu got deleted. so do the descriptor copy operation before the skb expand operation.Signed-off-by Karthikeyan Periyasamy <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-post-bringup branch of ath.git, thanks.
88b53b57ad55 ath11k: avoid use_after_free in ath11k_dp_rx_msdu_coalesce API
Signature · 9 lines
https://patchwork.kernel.org/patch/11219131/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k