* [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req()
@ 2022-02-03 8:25 Dan Carpenter
2022-02-03 9:29 ` Pkshih
2022-02-10 8:33 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-02-03 8:25 UTC (permalink / raw)
To: Yan-Hsuan Chuang, Ping-Ke Shih, Po-Hao Huang
Cc: Kalle Valo, linux-wireless, kernel-janitors
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 <dan.carpenter@oracle.com>
---
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(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index ce9535cce723..4c8e5ea5d069 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req()
2022-02-03 8:25 [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req() Dan Carpenter
@ 2022-02-03 9:29 ` Pkshih
2022-02-10 8:33 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Pkshih @ 2022-02-03 9:29 UTC (permalink / raw)
To: dan.carpenter@oracle.com, Bernie Huang, tony0620emma@gmail.com
Cc: kvalo@kernel.org, linux-wireless@vger.kernel.org,
kernel-janitors@vger.kernel.org
On Thu, 2022-02-03 at 11:25 +0300, Dan Carpenter wrote:
> 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 <dan.carpenter@oracle.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Thank you.
> ---
> 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(-)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
> index ce9535cce723..4c8e5ea5d069 100644
> --- a/drivers/net/wireless/realtek/rtw88/fw.c
> +++ b/drivers/net/wireless/realtek/rtw88/fw.c
> @@ -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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req()
2022-02-03 8:25 [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req() Dan Carpenter
2022-02-03 9:29 ` Pkshih
@ 2022-02-10 8:33 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2022-02-10 8:33 UTC (permalink / raw)
To: Dan Carpenter
Cc: Yan-Hsuan Chuang, Ping-Ke Shih, Po-Hao Huang, linux-wireless,
kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 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 <dan.carpenter@oracle.com>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Patch applied to wireless-next.git, thanks.
a954f29aea5d rtw88: fix use after free in rtw_hw_scan_update_probe_req()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220203082532.GA25151@kili/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-10 8:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-03 8:25 [PATCH v2] rtw88: fix use after free in rtw_hw_scan_update_probe_req() Dan Carpenter
2022-02-03 9:29 ` Pkshih
2022-02-10 8:33 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.