| Message ID | YCwgb/4F4Y+tyE56@mwanda (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtw88: Fix an error code in rtw_debugfs_set_rsvd_page() | expand |
Dan Carpenter <dan.carpenter@oracle.com> wrote: > The sscanf() function returns either 0 or 1 here. It doesn't return > error codes. We should return -EINVAL if the string is invalid. > > Fixes: c376c1fc87b7 ("rtw88: add h2c command in debugfs") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Why do you remove the num variable? I think the code is more readable with it. (Sorry, I'm not able to quote the code as I'm replying from patchwork script and it doesn't support that yet.)
On Mon, Mar 15, 2021 at 08:08:17AM +0000, Kalle Valo wrote: > Dan Carpenter <dan.carpenter@oracle.com> wrote: > > > The sscanf() function returns either 0 or 1 here. It doesn't return > > error codes. We should return -EINVAL if the string is invalid. > > > > Fixes: c376c1fc87b7 ("rtw88: add h2c command in debugfs") > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > Why do you remove the num variable? I think the code is more readable with it. > The way I wrote it is slightly more normal (457 vs 333) and we don't use "num" except for the one if statement. But I can write the other way. I'll resend. regards, dan carpenter
diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c index 948cb79050ea..99be7fcb5d71 100644 --- a/drivers/net/wireless/realtek/rtw88/debug.c +++ b/drivers/net/wireless/realtek/rtw88/debug.c @@ -262,15 +262,12 @@ static ssize_t rtw_debugfs_set_rsvd_page(struct file *filp, struct rtw_dev *rtwdev = debugfs_priv->rtwdev; char tmp[32 + 1]; u32 offset, page_num; - int num; rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); - num = sscanf(tmp, "%d %d", &offset, &page_num); - - if (num != 2) { + if (sscanf(tmp, "%d %d", &offset, &page_num) != 2) { rtw_warn(rtwdev, "invalid arguments\n"); - return num; + return -EINVAL; } debugfs_priv->rsvd_page.page_offset = offset;
The sscanf() function returns either 0 or 1 here. It doesn't return error codes. We should return -EINVAL if the string is invalid. Fixes: c376c1fc87b7 ("rtw88: add h2c command in debugfs") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/wireless/realtek/rtw88/debug.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)