2023-01-23 06:54:48

by Ping-Ke Shih

[permalink] [raw]
Subject: [PATCH 1/6] wifi: rtw89: fix potential wrong mapping for pkt-offload

From: Chin-Yen Lee <[email protected]>

When driver fails to send H2C to firmware for pkt-offload, we should not
update the pkt_list of driver, and need to release allocated pkt index to
avoid wrong mapping between driver and firmware.

Signed-off-by: Chin-Yen Lee <[email protected]>
Signed-off-by: Ping-Ke Shih <[email protected]>
---
drivers/net/wireless/realtek/rtw89/fw.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 85c7172e931bf..210785149801b 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -948,13 +948,13 @@ static int rtw89_fw_h2c_add_wow_fw_ofld(struct rtw89_dev *rtwdev,
if (!skb)
goto err;

- list_add_tail(&info->list, &rtw_wow->pkt_list);
ret = rtw89_fw_h2c_add_pkt_offload(rtwdev, &info->id, skb);
kfree_skb(skb);

if (ret)
- return ret;
+ goto err;

+ list_add_tail(&info->list, &rtw_wow->pkt_list);
*id = info->id;
return 0;

@@ -2133,6 +2133,7 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,
skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_LEN_PKT_OFLD + skb_ofld->len);
if (!skb) {
rtw89_err(rtwdev, "failed to alloc skb for h2c pkt offload\n");
+ rtw89_core_release_bit_map(rtwdev->pkt_offload, alloc_id);
return -ENOMEM;
}
skb_put(skb, H2C_LEN_PKT_OFLD);
@@ -2151,6 +2152,7 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id,
ret = rtw89_h2c_tx(rtwdev, skb, false);
if (ret) {
rtw89_err(rtwdev, "failed to send h2c\n");
+ rtw89_core_release_bit_map(rtwdev->pkt_offload, alloc_id);
goto fail;
}

@@ -2684,13 +2686,14 @@ static int rtw89_append_probe_req_ie(struct rtw89_dev *rtwdev,
goto out;
}

- list_add_tail(&info->list, &scan_info->pkt_list[band]);
ret = rtw89_fw_h2c_add_pkt_offload(rtwdev, &info->id, new);
if (ret) {
kfree_skb(new);
+ kfree(info);
goto out;
}

+ list_add_tail(&info->list, &scan_info->pkt_list[band]);
kfree_skb(new);
}
out:
--
2.25.1



2023-02-13 17:18:03

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH 1/6] wifi: rtw89: fix potential wrong mapping for pkt-offload

Ping-Ke Shih <[email protected]> wrote:

> From: Chin-Yen Lee <[email protected]>
>
> When driver fails to send H2C to firmware for pkt-offload, we should not
> update the pkt_list of driver, and need to release allocated pkt index to
> avoid wrong mapping between driver and firmware.
>
> Signed-off-by: Chin-Yen Lee <[email protected]>
> Signed-off-by: Ping-Ke Shih <[email protected]>

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

b8e8ff842b1b wifi: rtw89: fix potential wrong mapping for pkt-offload
5c12bb66b79d wifi: rtw89: refine packet offload flow
5da5ba7e6ec4 wifi: rtw89: add use of pkt_list offload to debug entry
2e5a65f5952f wifi: rtw89: 8852b: reset IDMEM mode to default value
e5624482ba3e wifi: rtw89: 8852b: don't support LPS-PG mode after firmware 0.29.26.0
7410bd727584 wifi: rtw89: 8852b: try to use NORMAL_CE type firmware first

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

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