Skip to contentSkip to conversation

rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()

PATCH Superseded Wei Chen 4 participants 4 messages Mar 26, 2023 – Mar 31, 2023

Subsystems (3)
lore
Share & tools
lore

Wei Chen

author
#0 lore raw

PATCH v2 1/1 rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()

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.

Fixes 610247f46feb ("rtlwifi: Improve debugging by using debugfs")

---
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(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +3 -3
index 3e7f9b4f1f19..9eb26dfe4ca9 100644
@@ -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);
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · 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.

Fixes 610247f46feb ("rtlwifi: Improve debugging by using debugfs")
maintainer
#2 lore raw
In reply to Wei Chen
Quoted 11 lines

-----Original Message-----
From: Wei Chen <[email protected]>
Sent: Sunday, March 26, 2023 1:32 PM
To: Ping-Ke Shih <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Wei Chen <[email protected]>
Subject: [PATCH v2] rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()

Subject prefix should be "wifi: rtlwifi: ...".

[...]

#3 lore raw

Re: [v2] wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()

In reply to Wei Chen
Quoted 10 lines · 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.

Fixes 610247f46feb ("rtlwifi: Improve debugging by using debugfs")

Patch applied to wireless-next.git, thanks.

905a9241e4e8 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches