mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 00:43:08 -04:00
net: pktgen: fix ctrl interface command parsing
Enable command writing without trailing '\n': - the good case $ echo "reset" > /proc/net/pktgen/pgctrl - the bad case (before the patch) $ echo -n "reset" > /proc/net/pktgen/pgctrl -bash: echo: write error: Invalid argument - with patch applied $ echo -n "reset" > /proc/net/pktgen/pgctrl Signed-off-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250219084527.20488-7-ps.report@gmx.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
1c3bc2c325
commit
1e5e511373
@@ -517,21 +517,23 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
char data[128];
|
||||
size_t max;
|
||||
struct pktgen_net *pn = net_generic(current->nsproxy->net_ns, pg_net_id);
|
||||
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
return -EPERM;
|
||||
|
||||
if (count == 0)
|
||||
if (count < 1)
|
||||
return -EINVAL;
|
||||
|
||||
if (count > sizeof(data))
|
||||
count = sizeof(data);
|
||||
|
||||
if (copy_from_user(data, buf, count))
|
||||
max = min(count, sizeof(data) - 1);
|
||||
if (copy_from_user(data, buf, max))
|
||||
return -EFAULT;
|
||||
|
||||
data[count - 1] = 0; /* Strip trailing '\n' and terminate string */
|
||||
if (data[max - 1] == '\n')
|
||||
data[max - 1] = 0; /* strip trailing '\n', terminate string */
|
||||
else
|
||||
data[max] = 0; /* terminate string */
|
||||
|
||||
if (!strcmp(data, "stop"))
|
||||
pktgen_stop_all_threads(pn);
|
||||
|
||||
Reference in New Issue
Block a user