d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtw88: plug various skb leaks in error cases

Browse Source 
Based on manual inspection the skbs are not freed in those unlikely
cases, though all would give an error message so would have gone noticed
if happened.
While here fix a typo in one of these error messages.

MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2022-06-05 18:07:48 +00:00
parent dbc06dd98a
commit 728afa885f
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/contrib/dev/rtw88/fw.c
View File

@ -1825,6 +1825,9 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_ssids,
skb_unlink(skb, probe_req_list);
rtw_fill_rsvd_page_desc(rtwdev, skb, RSVD_PROBE_REQ);
if (skb->len > page_size * RTW_PROBE_PG_CNT) {
#if defined(__FreeBSD__)
kfree_skb(skb);
#endif
ret = -EINVAL;
goto out;
}

6
sys/contrib/dev/rtw88/pci.c
View File

@ -965,6 +965,9 @@ static int rtw_pci_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf,
ret = rtw_pci_tx_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_BCN);
if (ret) {
#if defined(__FreeBSD__)
dev_kfree_skb_any(skb);
#endif
rtw_err(rtwdev, "failed to write rsvd page data\n");
return ret;
}
@ -989,6 +992,9 @@ static int rtw_pci_write_data_h2c(struct rtw_dev *rtwdev, u8 *buf, u32 size)
ret = rtw_pci_tx_write_data(rtwdev, &pkt_info, skb, RTW_TX_QUEUE_H2C);
if (ret) {
#if defined(__FreeBSD__)
dev_kfree_skb_any(skb);
#endif
rtw_err(rtwdev, "failed to write h2c data\n");
return ret;
}

5
sys/contrib/dev/rtw88/tx.c
View File

@ -638,7 +638,12 @@ static void rtw_txq_push(struct rtw_dev *rtwdev,
ret = rtw_txq_push_skb(rtwdev, rtwtxq, skb);
if (ret) {
#if defined(__FreeBSD__)
dev_kfree_skb_any(skb);
rtw_err(rtwdev, "failed to push skb, ret %d\n", ret);
#else
rtw_err(rtwdev, "failed to pusk skb, ret %d\n", ret);
#endif
break;
}
}