diff mbox series

[net-next,v3,06/10] net: pktgen: fix ctrl interface command parsing

Message ID 20250203170201.1661703-7-ps.report@gmx.net (mailing list archive)
State New
Headers show
Series Some pktgen fixes/improvments | expand

Commit Message

Peter Seiderer Feb. 3, 2025, 5:01 p.m. UTC 
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>
---
Changes v2 -> v3:
      - new patch
---
 net/core/pktgen.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Simon Horman Feb. 4, 2025, 2:44 p.m. UTC | #1 
On Mon, Feb 03, 2025 at 06:01:57PM +0100, Peter Seiderer wrote:
> 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>
diff mbox series

Patch

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index c8a5b4d17407..f6e35ba035c7 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -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);