Commit 1e5e5113 authored by Peter Seiderer's avatar Peter Seiderer Committed by Jakub Kicinski
Browse files

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: default avatarPeter Seiderer <ps.report@gmx.net>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250219084527.20488-7-ps.report@gmx.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1c3bc2c3

net/core/pktgen.c

+8 −6
Original line number Diff line number Diff line
@@ -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);