Skip to content

Commit 461ccc6

Browse files
pseidererpaniakin-aws
authored andcommitted
net: pktgen: fix access outside of user given buffer in pktgen_thread_write()
Honour the user given buffer size for the strn_len() calls (otherwise strn_len() will access memory outside of the user given buffer). Signed-off-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250219084527.20488-8-ps.report@gmx.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Andrew Paniakin <apanyaki@amazon.com>
1 parent 4727bd4 commit 461ccc6

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

net/core/pktgen.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,8 +1865,8 @@ static ssize_t pktgen_thread_write(struct file *file,
18651865
i = len;
18661866

18671867
/* Read variable name */
1868-
1869-
len = strn_len(&user_buffer[i], sizeof(name) - 1);
1868+
max = min(sizeof(name) - 1, count - i);
1869+
len = strn_len(&user_buffer[i], max);
18701870
if (len < 0)
18711871
return len;
18721872

@@ -1896,7 +1896,8 @@ static ssize_t pktgen_thread_write(struct file *file,
18961896
if (!strcmp(name, "add_device")) {
18971897
char f[32];
18981898
memset(f, 0, 32);
1899-
len = strn_len(&user_buffer[i], sizeof(f) - 1);
1899+
max = min(sizeof(f) - 1, count - i);
1900+
len = strn_len(&user_buffer[i], max);
19001901
if (len < 0) {
19011902
ret = len;
19021903
goto out;

0 commit comments

Comments
 (0)