| Message ID | 20250211073915.648418-1-dmantipov@yandex.ru (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Ping-Ke Shih |
| Headers | show |
| Series | [1/2] wifi: rtw89: simplify rtw89_debug_priv_mac_reg_dump_select() | expand |
Dmitry Antipov <dmantipov@yandex.ru> wrote: > Simplify 'rtw89_debug_priv_mac_reg_dump_select()' by using > the convenient 'kstrtoint_from_user()'. Compile tested only. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> The function has been changed, because of switch wiphy_lock(). No copy_from_user() now. Skip this patch. > --- > drivers/net/wireless/realtek/rtw89/debug.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c > index 09fa977a6e6d..339f9f6672fd 100644 > --- a/drivers/net/wireless/realtek/rtw89/debug.c > +++ b/drivers/net/wireless/realtek/rtw89/debug.c > @@ -924,17 +924,10 @@ rtw89_debug_priv_mac_reg_dump_select(struct file *filp, > struct rtw89_debugfs_priv *debugfs_priv = m->private; > struct rtw89_dev *rtwdev = debugfs_priv->rtwdev; > const struct rtw89_chip_info *chip = rtwdev->chip; > - char buf[32]; > - size_t buf_size; > int sel; > int ret; > > - buf_size = min(count, sizeof(buf) - 1); > - if (copy_from_user(buf, user_buf, buf_size)) > - return -EFAULT; > - > - buf[buf_size] = '\0'; > - ret = kstrtoint(buf, 0, &sel); > + ret = kstrtoint_from_user(user_buf, count, 0, &sel); > if (ret) > return ret; > > -- > 2.48.1 >
diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c index 09fa977a6e6d..339f9f6672fd 100644 --- a/drivers/net/wireless/realtek/rtw89/debug.c +++ b/drivers/net/wireless/realtek/rtw89/debug.c @@ -924,17 +924,10 @@ rtw89_debug_priv_mac_reg_dump_select(struct file *filp, struct rtw89_debugfs_priv *debugfs_priv = m->private; struct rtw89_dev *rtwdev = debugfs_priv->rtwdev; const struct rtw89_chip_info *chip = rtwdev->chip; - char buf[32]; - size_t buf_size; int sel; int ret; - buf_size = min(count, sizeof(buf) - 1); - if (copy_from_user(buf, user_buf, buf_size)) - return -EFAULT; - - buf[buf_size] = '\0'; - ret = kstrtoint(buf, 0, &sel); + ret = kstrtoint_from_user(user_buf, count, 0, &sel); if (ret) return ret;
Simplify 'rtw89_debug_priv_mac_reg_dump_select()' by using the convenient 'kstrtoint_from_user()'. Compile tested only. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- drivers/net/wireless/realtek/rtw89/debug.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)