Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netdevsim: switch to memdup_user_nul()

Browse source 
[ Upstream commit 20fd4f421cf4c21ab37a8bf31db50c69f1b49355 ]

Use memdup_user_nul() helper instead of open-coding to
simplify the code.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: ee76746387f6 ("netdevsim: prevent bad user input in nsim_dev_health_break_write()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wei Yongjun 2021-03-24 14:42:20 +00:00 • committed by Ksawlii
parent ce3b97bfca
commit dfe8c65162
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/netdevsim/health.c
View file

@ -235,15 +235,10 @@ static ssize_t nsim_dev_health_break_write(struct file *file,
char *break_msg; char *break_msg;
int err; int err;
break_msg = kmalloc(count + 1, GFP_KERNEL); break_msg = memdup_user_nul(data, count);
if (!break_msg) if (IS_ERR(break_msg))
return -ENOMEM; return PTR_ERR(break_msg);
if (copy_from_user(break_msg, data, count)) {
err = -EFAULT;
goto out;
}
break_msg[count] = '\0';
if (break_msg[count - 1] == '\n') if (break_msg[count - 1] == '\n')
break_msg[count - 1] = '\0'; break_msg[count - 1] = '\0';