Skip to content

Commit 425e644

Browse files
pseidererkuba-moo
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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 1e5e511 commit 425e644

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
@@ -1900,8 +1900,8 @@ static ssize_t pktgen_thread_write(struct file *file,
19001900
i = len;
19011901

19021902
/* Read variable name */
1903-
1904-
len = strn_len(&user_buffer[i], sizeof(name) - 1);
1903+
max = min(sizeof(name) - 1, count - i);
1904+
len = strn_len(&user_buffer[i], max);
19051905
if (len < 0)
19061906
return len;
19071907

@@ -1931,7 +1931,8 @@ static ssize_t pktgen_thread_write(struct file *file,
19311931
if (!strcmp(name, "add_device")) {
19321932
char f[32];
19331933
memset(f, 0, 32);
1934-
len = strn_len(&user_buffer[i], sizeof(f) - 1);
1934+
max = min(sizeof(f) - 1, count - i);
1935+
len = strn_len(&user_buffer[i], max);
19351936
if (len < 0) {
19361937
ret = len;
19371938
goto out;

0 commit comments

Comments
 (0)