diff mbox series

[1/3] rtw88: check for validity before using a pointer

Message ID 20220121070813.9656-2-pkshih@realtek.com (mailing list archive)
State Accepted
Commit a12f809968dbf46ce2a6bc94463db8d431bb75fc
Delegated to: Kalle Valo
Headers show
Series rtw88: some fixes of hw_scan | expand

Commit Message

Ping-Ke Shih Jan. 21, 2022, 7:08 a.m. UTC 
From: Muhammad Usama Anjum <usama.anjum@collabora.com>

ieee80211_probereq_get() can return NULL. Pointer skb should be checked
for validty before use. If it is not valid, list of skbs needs to be
freed.

Fixes: 10d162b2ed39 ("rtw88: 8822c: add ieee80211_ops::hw_scan")
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw88/fw.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Kalle Valo Jan. 31, 2022, 3:47 p.m. UTC | #1 
Ping-Ke Shih <pkshih@realtek.com> wrote:

> From: Muhammad Usama Anjum <usama.anjum@collabora.com>
> 
> ieee80211_probereq_get() can return NULL. Pointer skb should be checked
> for validty before use. If it is not valid, list of skbs needs to be
> freed.
> 
> Fixes: 10d162b2ed39 ("rtw88: 8822c: add ieee80211_ops::hw_scan")
> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

3 patches applied to wireless-next.git, thanks.

a12f809968db rtw88: check for validity before using a pointer
c17f27167b4c rtw88: fix idle mode flow for hw scan
d95984b5580d rtw88: fix memory overrun and memory leak during hw_scan
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 2f7c036f90221..b56dc43229d28 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1866,11 +1866,19 @@  static int rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev,
 					     req->ssids[i].ssid,
 					     req->ssids[i].ssid_len,
 					     req->ie_len);
+		if (!skb)
+			goto out;
 		rtw_append_probe_req_ie(rtwdev, skb, &list, rtwvif);
 		kfree_skb(skb);
 	}
 
 	return _rtw_hw_scan_update_probe_req(rtwdev, num, &list);
+
+out:
+	skb_queue_walk(&list, skb)
+		kfree_skb(skb);
+
+	return -ENOMEM;
 }
 
 static int rtw_add_chan_info(struct rtw_dev *rtwdev, struct rtw_chan_info *info,