* [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
@ 2023-03-25 8:34 Wei Chen
2023-03-25 9:47 ` Simon Horman
0 siblings, 1 reply; 5+ messages in thread
From: Wei Chen @ 2023-03-25 8:34 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_rfreg 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.
Signed-off-by: Wei Chen <harperchen1110@gmail.com>
---
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 3e7f9b4f1f19..9eb26dfe4ca9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.c
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -375,8 +375,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(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';
@@ -386,7 +386,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,
if (num != 4) {
rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,
"Format is <path> <addr> <mask> <data>\n");
- return count;
+ return -EINVAL;
}
rtl_set_rfreg(hw, path, addr, bitmask, data);
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
2023-03-25 8:34 [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg() Wei Chen
@ 2023-03-25 9:47 ` Simon Horman
2023-03-26 5:47 ` Wei Chen
0 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2023-03-25 9:47 UTC (permalink / raw)
To: Wei Chen
Cc: pkshih, kvalo, davem, edumazet, kuba, pabeni, linux-wireless,
netdev, linux-kernel
On Sat, Mar 25, 2023 at 08:34:29AM +0000, Wei Chen wrote:
> If there is a failure during copy_from_user or user-provided data buffer
> is invalid, rtl_debugfs_set_write_rfreg 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.
>
> Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Hi Wei Chen,
* I'm not sure if a fixes tag is appropriate for this.
But if so, perhaps it should be:
Fixes: 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
* I think the preferred subject prefix may be 'rtlwifi: ' (without the leading 'wireless: ').
* This seems to be v2 of this patch, which would be best noted in
the subject '[PATCH v2]'.
The above notwithstanding, the code changes look correct to me.
Reviewed-by: Simon Horman <simon.horman@corigine.com>
> ---
> 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 3e7f9b4f1f19..9eb26dfe4ca9 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/debug.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
> @@ -375,8 +375,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(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';
>
> @@ -386,7 +386,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,
> if (num != 4) {
> rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,
> "Format is <path> <addr> <mask> <data>\n");
> - return count;
> + return -EINVAL;
> }
>
> rtl_set_rfreg(hw, path, addr, bitmask, data);
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
2023-03-25 9:47 ` Simon Horman
@ 2023-03-26 5:47 ` Wei Chen
2023-03-26 8:03 ` Simon Horman
0 siblings, 1 reply; 5+ messages in thread
From: Wei Chen @ 2023-03-26 5:47 UTC (permalink / raw)
To: Simon Horman
Cc: pkshih, kvalo, davem, edumazet, kuba, pabeni, linux-wireless,
netdev, linux-kernel
Dear Simon,
Thanks for the advice and review. I have sent the second version of the patch.
Besides, rtl_debugfs_set_write_reg also suffers from the incorrect
error code problem. I also sent v2 of the corresponding patch. Hope
there is no confusion between these two patches.
Best,
Wei
On Sat, 25 Mar 2023 at 17:48, Simon Horman <simon.horman@corigine.com> wrote:
>
> On Sat, Mar 25, 2023 at 08:34:29AM +0000, Wei Chen wrote:
> > If there is a failure during copy_from_user or user-provided data buffer
> > is invalid, rtl_debugfs_set_write_rfreg 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.
> >
> > Signed-off-by: Wei Chen <harperchen1110@gmail.com>
>
> Hi Wei Chen,
>
> * I'm not sure if a fixes tag is appropriate for this.
> But if so, perhaps it should be:
>
> Fixes: 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
>
> * I think the preferred subject prefix may be 'rtlwifi: ' (without the leading 'wireless: ').
>
> * This seems to be v2 of this patch, which would be best noted in
> the subject '[PATCH v2]'.
>
> The above notwithstanding, the code changes look correct to me.
>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
>
> > ---
> > 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 3e7f9b4f1f19..9eb26dfe4ca9 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/debug.c
> > +++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
> > @@ -375,8 +375,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(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';
> >
> > @@ -386,7 +386,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,
> > if (num != 4) {
> > rtl_dbg(rtlpriv, COMP_ERR, DBG_DMESG,
> > "Format is <path> <addr> <mask> <data>\n");
> > - return count;
> > + return -EINVAL;
> > }
> >
> > rtl_set_rfreg(hw, path, addr, bitmask, data);
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
2023-03-26 5:47 ` Wei Chen
@ 2023-03-26 8:03 ` Simon Horman
2023-03-26 17:32 ` Larry Finger
0 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2023-03-26 8:03 UTC (permalink / raw)
To: Wei Chen
Cc: pkshih, kvalo, davem, edumazet, kuba, pabeni, linux-wireless,
netdev, linux-kernel
On Sun, Mar 26, 2023 at 01:47:51PM +0800, Wei Chen wrote:
> Dear Simon,
>
> Thanks for the advice and review. I have sent the second version of the patch.
>
> Besides, rtl_debugfs_set_write_reg also suffers from the incorrect
> error code problem. I also sent v2 of the corresponding patch. Hope
> there is no confusion between these two patches.
Thanks. I now see there are two similar but different patches. My bad.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
2023-03-26 8:03 ` Simon Horman
@ 2023-03-26 17:32 ` Larry Finger
0 siblings, 0 replies; 5+ messages in thread
From: Larry Finger @ 2023-03-26 17:32 UTC (permalink / raw)
To: Simon Horman, Wei Chen
Cc: pkshih, kvalo, davem, edumazet, kuba, pabeni, linux-wireless,
netdev, linux-kernel
On 3/26/23 03:03, Simon Horman wrote:
> On Sun, Mar 26, 2023 at 01:47:51PM +0800, Wei Chen wrote:
>> Dear Simon,
>>
>> Thanks for the advice and review. I have sent the second version of the patch.
>>
>> Besides, rtl_debugfs_set_write_reg also suffers from the incorrect
>> error code problem. I also sent v2 of the corresponding patch. Hope
>> there is no confusion between these two patches.
>
> Thanks. I now see there are two similar but different patches. My bad.
Avoid all such misunderstandings by making a patch set.
Larry
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-26 17:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-25 8:34 [PATCH] wireless: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg() Wei Chen
2023-03-25 9:47 ` Simon Horman
2023-03-26 5:47 ` Wei Chen
2023-03-26 8:03 ` Simon Horman
2023-03-26 17:32 ` Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).