* [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
@ 2023-03-26 5:42 Wei Chen
2023-03-26 8:11 ` Simon Horman
2023-03-31 14:53 ` [v2] wifi: " Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Wei Chen @ 2023-03-26 5:42 UTC (permalink / raw)
To: pkshih
Cc: kvalo, davem, edumazet, kuba, pabeni, linux-wireless, netdev,
linux-kernel, Wei Chen
If there is a failure during copy_from_user or user-provided data buffer is
invalid, rtl_debugfs_set_write_reg should return negative error code instead
of a positive value count.
Fix this bug by returning correct error code. Moreover, the check of buffer
against null is removed since it will be handled by copy_from_user.
Fixes: 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
Signed-off-by: Wei Chen <harperchen1110@gmail.com>
---
Changes in v2:
- Add fixes commit tag
- Correct the subject prefix
drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c
index 0b1bc04cb6ad..3e7f9b4f1f19 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.c
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -278,8 +278,8 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp,
tmp_len = (count > sizeof(tmp) - 1 ? sizeof(tmp) - 1 : count);
- if (!buffer || copy_from_user(tmp, buffer, tmp_len))
- return count;
+ if (copy_from_user(tmp, buffer, tmp_len))
+ return -EFAULT;
tmp[tmp_len] = '\0';
@@ -287,7 +287,7 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp,
num = sscanf(tmp, "%x %x %x", &addr, &val, &len);
if (num != 3)
- return count;
+ return -EINVAL;
switch (len) {
case 1:
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
2023-03-26 5:42 [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg() Wei Chen
@ 2023-03-26 8:11 ` Simon Horman
2023-03-31 14:53 ` [v2] wifi: " Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-03-26 8:11 UTC (permalink / raw)
To: Wei Chen
Cc: pkshih, kvalo, davem, edumazet, kuba, pabeni, linux-wireless,
netdev, linux-kernel
On Sun, Mar 26, 2023 at 05:42:17AM +0000, Wei Chen wrote:
> If there is a failure during copy_from_user or user-provided data buffer is
> invalid, rtl_debugfs_set_write_reg should return negative error code instead
> of a positive value count.
>
> Fix this bug by returning correct error code. Moreover, the check of buffer
> against null is removed since it will be handled by copy_from_user.
>
> Fixes: 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [v2] wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
2023-03-26 5:42 [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg() Wei Chen
2023-03-26 8:11 ` Simon Horman
@ 2023-03-31 14:53 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-03-31 14:53 UTC (permalink / raw)
To: Wei Chen
Cc: pkshih, davem, edumazet, kuba, pabeni, linux-wireless, netdev,
linux-kernel, Wei Chen
Wei Chen <harperchen1110@gmail.com> wrote:
> If there is a failure during copy_from_user or user-provided data buffer is
> invalid, rtl_debugfs_set_write_reg should return negative error code instead
> of a positive value count.
>
> Fix this bug by returning correct error code. Moreover, the check of buffer
> against null is removed since it will be handled by copy_from_user.
>
> Fixes: 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Patch applied to wireless-next.git, thanks.
5dbe1f8eb8c5 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230326054217.93492-1-harperchen1110@gmail.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-31 14:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-26 5:42 [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg() Wei Chen
2023-03-26 8:11 ` Simon Horman
2023-03-31 14:53 ` [v2] wifi: " Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®