Skip to content

Commit 7e7ba73

Browse files
dTenebraeNipaLocal
authored and
NipaLocal
committed
pktgen: Avoid out-of-bounds access in get_imix_entries
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 <artem.chernyshev@red-soft.ru> [ fp: allow to fill the array completely; minor changelog cleanup ] Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Signed-off-by: NipaLocal <nipa@local>
1 parent 6a6bb61 commit 7e7ba73

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

net/core/pktgen.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,9 @@ static ssize_t get_imix_entries(const char __user *buffer,
851851
unsigned long weight;
852852
unsigned long size;
853853

854+
if (pkt_dev->n_imix_entries >= MAX_IMIX_ENTRIES)
855+
return -E2BIG;
856+
854857
len = num_arg(&buffer[i], max_digits, &size);
855858
if (len < 0)
856859
return len;
@@ -880,9 +883,6 @@ static ssize_t get_imix_entries(const char __user *buffer,
880883

881884
i++;
882885
pkt_dev->n_imix_entries++;
883-
884-
if (pkt_dev->n_imix_entries > MAX_IMIX_ENTRIES)
885-
return -E2BIG;
886886
} while (c == ' ');
887887

888888
return i;

0 commit comments

Comments
 (0)