Skip to content

Commit

Permalink
wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
Browse files Browse the repository at this point in the history
[ Upstream commit 5dbe1f8 ]

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: 610247f ("rtlwifi: Improve debugging by using debugfs")
Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230326054217.93492-1-harperchen1110@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
harperchen authored and gregkh committed May 11, 2023
1 parent f4614ac commit e8b6133
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/realtek/rtlwifi/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,16 +278,16 @@ 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';

/* write BB/MAC register */
num = sscanf(tmp, "%x %x %x", &addr, &val, &len);

if (num != 3)
return count;
return -EINVAL;

switch (len) {
case 1:
Expand Down

0 comments on commit e8b6133

Please sign in to comment.