Skip to contentSkip to conversation

rtw88: fix use after free in rtw_hw_scan_update_probe_req()

PATCH In review Dan Carpenter 3 participants 3 messages Feb 3, 2022 – Feb 10, 2022

Subsystems (2)
Kernel janitors Realtek wireless driver (rtw88)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH v2 1/1 rtw88: fix use after free in rtw_hw_scan_update_probe_req()

This code needs to use skb_queue_walk_safe() instead of skb_queue_walk() because it frees the list iterator.

Fixes d95984b5580d ("rtw88: fix memory overrun and memory leak during hw_scan")
Signed-off-by Dan Carpenter <[email protected]>

---
v2: Fix a similar issue in _rtw_hw_scan_update_probe_req() as pointed out by Ping-Ke Shih.

 drivers/net/wireless/realtek/rtw88/fw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +3 -3
index ce9535cce723..4c8e5ea5d069 100644
@@ -1853,7 +1853,7 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8 num_probes,
 	rtwdev->scan_info.probe_pg_size = page_offset;
 out:
 	kfree(buf);
-	skb_queue_walk(probe_req_list, skb)
+	skb_queue_walk_safe(probe_req_list, skb, tmp)
 		kfree_skb(skb);
 
 	return ret;

@@ -1864,7 +1864,7 @@ static int rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev,
 {
 	struct cfg80211_scan_request *req = rtwvif->scan_req;
 	struct sk_buff_head list;
-	struct sk_buff *skb;
+	struct sk_buff *skb, *tmp;
 	u8 num = req->n_ssids, i, bands = 0;
 	int ret;
 

@@ -1889,7 +1889,7 @@ static int rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev,
 	return _rtw_hw_scan_update_probe_req(rtwdev, num * bands, &list);
 
 out:
-	skb_queue_walk(&list, skb)
+	skb_queue_walk_safe(&list, skb, tmp)
 		kfree_skb(skb);
 
 	return ret;
Signature · 1 line
2.20.1
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

This code needs to use skb_queue_walk_safe() instead of skb_queue_walk() because it frees the list iterator.

Fixes d95984b5580d ("rtw88: fix memory overrun and memory leak during hw_scan")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Ping-Ke Shih <[email protected]>

Thank you.

Quoted 39 lines

---
v2: Fix a similar issue in _rtw_hw_scan_update_probe_req() as pointed out by Ping-Ke Shih.

 drivers/net/wireless/realtek/rtw88/fw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +1 -1
index ce9535cce723..4c8e5ea5d069 100644
@@ -1853,7 +1853,7 @@ static int _rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev, u8
 num_probes,
 	rtwdev->scan_info.probe_pg_size = page_offset;
 out:
 	kfree(buf);
-	skb_queue_walk(probe_req_list, skb)
+	skb_queue_walk_safe(probe_req_list, skb, tmp)
 		kfree_skb(skb);
drivers/net/wireless/realtek/rtw88/fw.c +2 -2
 	return ret;

@@ -1864,7 +1864,7 @@ static int rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev,
 {
 	struct cfg80211_scan_request *req = rtwvif->scan_req;
 	struct sk_buff_head list;
-	struct sk_buff *skb;
+	struct sk_buff *skb, *tmp;
 	u8 num = req->n_ssids, i, bands = 0;
 	int ret;
 

@@ -1889,7 +1889,7 @@ static int rtw_hw_scan_update_probe_req(struct rtw_dev *rtwdev,
 	return _rtw_hw_scan_update_probe_req(rtwdev, num * bands, &list);
 
 out:
-	skb_queue_walk(&list, skb)
+	skb_queue_walk_safe(&list, skb, tmp)
 		kfree_skb(skb);
 
 	return ret;
#2 lore raw
In reply to Dan Carpenter
Quoted 6 lines · Dan Carpenter

This code needs to use skb_queue_walk_safe() instead of skb_queue_walk() because it frees the list iterator.

Fixes d95984b5580d ("rtw88: fix memory overrun and memory leak during hw_scan")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

a954f29aea5d rtw88: fix use after free in rtw_hw_scan_update_probe_req()

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/20220203082532.GA25151@kili/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches