evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath10k: add extra sanity check when popping amsdu

Browse source 
The netbuf pop can return NULL. Make sure to check
for that. It shouldn't happen but better safe than
sorry.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior 2014-10-23 17:04:24 +03:00 • committed by Kalle Valo
parent 34440df03d
commit b30595aea3
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/ath/ath10k/htt_rx.c
View file

@ -428,6 +428,15 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
while (msdu_chained--) { while (msdu_chained--) {
struct sk_buff *next = ath10k_htt_rx_netbuf_pop(htt); struct sk_buff *next = ath10k_htt_rx_netbuf_pop(htt);
if (!next) {
ath10k_warn(ar, "failed to pop chained msdu\n");
ath10k_htt_rx_free_msdu_chain(*head_msdu);
*head_msdu = NULL;
msdu = NULL;
htt->rx_confused = true;
break;
}
skb_trim(next, 0); skb_trim(next, 0);
skb_put(next, min(msdu_len, HTT_RX_BUF_SIZE)); skb_put(next, min(msdu_len, HTT_RX_BUF_SIZE));
msdu_len -= next->len; msdu_len -= next->len;