2023-07-15 07:27:35

by Zhang Shurong

Subject: [PATCH v2] wifi: rtw89: debug: fix error code in rtw89_debug_priv_btc_manual_set

If there is a failure during kstrtobool_from_user()
rtw89_debug_priv_btc_manual_set should return negative error code
instead of returning the count driectly.

Fix this bug by returning the correct error code.

Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver")
Signed-off-by: Zhang Shurong <[email protected]>
---
Changes in v2:
- Corrected the format of this patch
- Used variable ret instead of goto out

drivers/net/wireless/realtek/rtw89/debug.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
index a4bbac916e22..ce5a9ac08145 100644
--- a/drivers/net/wireless/realtek/rtw89/debug.c
+++ b/drivers/net/wireless/realtek/rtw89/debug.c
@@ -3193,12 +3193,14 @@ static ssize_t rtw89_debug_priv_btc_manual_set(struct file *filp,
struct rtw89_dev *rtwdev = debugfs_priv->rtwdev;
struct rtw89_btc *btc = &rtwdev->btc;
bool btc_manual;
+ int ret;

- if (kstrtobool_from_user(user_buf, count, &btc_manual))
- goto out;
+ ret = kstrtobool_from_user(user_buf, count, &btc_manual);
+ if (ret)
+ return ret;

btc->ctrl.manual = btc_manual;
-out:
+
return count;
}

--
2.30.2

2023-07-15 10:26:23

by Zhang Shurong

Subject: Re: [PATCH v2] wifi: rtw89: debug: fix error code in rtw89_debug_priv_btc_manual_set

在 2023年7月15日星期六 CST 下午5:22:08，Markus Elfring 写道：
> > If there is a failure during kstrtobool_from_user()
> > rtw89_debug_priv_btc_manual_set should return negative error code
> > instead of returning the count driectly.
> >
> > Fix this bug by returning the correct error code.
>
> How do you think about to use an other wording approach
> (like the following) for an improved change description?
>
>
> Return an error code instead of a count after a failed call
> of the function “kstrtobool_from_user”.
> Omit the label “out” with this source code correction.
>
>
> Regards,
> Markus
Thanks for your kindness reply and advice and I will change my description
in the next version.

Regards,
Shurong