Skip to content

Commit

Permalink
pktgen: Avoid out-of-bounds access in get_imix_entries
Browse files Browse the repository at this point in the history
Passing a sufficient amount of imix entries leads to invalid access to the
pkt_dev->imix_entries array because of the incorrect boundary check.

UBSAN: array-index-out-of-bounds in net/core/pktgen.c:874:24
index 20 is out of range for type 'imix_pkt [20]'
CPU: 2 PID: 1210 Comm: bash Not tainted 6.10.0-rc1 torvalds#121
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996)
Call Trace:
<TASK>
dump_stack_lvl lib/dump_stack.c:117
__ubsan_handle_out_of_bounds lib/ubsan.c:429
get_imix_entries net/core/pktgen.c:874
pktgen_if_write net/core/pktgen.c:1063
pde_write fs/proc/inode.c:334
proc_reg_write fs/proc/inode.c:346
vfs_write fs/read_write.c:593
ksys_write fs/read_write.c:644
do_syscall_64 arch/x86/entry/common.c:83
entry_SYSCALL_64_after_hwframe arch/x86/entry/entry_64.S:130

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 52a62f8 ("pktgen: Parse internet mix (imix) input")
Signed-off-by: Artem Chernyshev <[email protected]>
[ fp: allow to fill the array completely; minor changelog cleanup ]
Signed-off-by: Fedor Pchelkin <[email protected]>
Signed-off-by: NipaLocal <nipa@local>
  • Loading branch information
dTenebrae authored and NipaLocal committed Jan 11, 2025
1 parent 42b7658 commit dc4b594
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/core/pktgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,9 @@ static ssize_t get_imix_entries(const char __user *buffer,
unsigned long weight;
unsigned long size;

if (pkt_dev->n_imix_entries >= MAX_IMIX_ENTRIES)
return -E2BIG;

len = num_arg(&buffer[i], max_digits, &size);
if (len < 0)
return len;
Expand Down Expand Up @@ -880,9 +883,6 @@ static ssize_t get_imix_entries(const char __user *buffer,

i++;
pkt_dev->n_imix_entries++;

if (pkt_dev->n_imix_entries > MAX_IMIX_ENTRIES)
return -E2BIG;
} while (c == ' ');

return i;
Expand Down

0 comments on commit dc4b594

Please sign in to comment.