Skip to contentSkip to conversation

selftests/bpf: Fix map_fds buffer overflow in test_verifier

PATCH In review Ilya Leoshkevich 2 participants 2 messages Dec 20, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/bpf: Fix map_fds buffer overflow in test_verifier

do_test_fixup() accesses map_fds[21], which is out of bounds. Extend map_fds array to 22 elements.

Fixes e60e6962c503 ("selftests/bpf: Add tests for restricted helpers")
---
 tools/testing/selftests/bpf/test_verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_verifier.c +1 -1
index b0bd2a1f6d52..76cd903117af 100644
@@ -53,7 +53,7 @@
 #define MAX_INSNS	BPF_MAXINSNS
 #define MAX_TEST_INSNS	1000000
 #define MAX_FIXUPS	8
-#define MAX_NR_MAPS	21
+#define MAX_NR_MAPS	22
 #define MAX_TEST_RUNS	8
 #define POINTER_VALUE	0xcafe4all
 #define TEST_DATA_LEN	64
Signature · 1 line
2.31.1
#1 lore raw
Quoted 14 lines · Ilya Leoshkevich

do_test_fixup() accesses map_fds[21], which is out of bounds. Extend map_fds array to 22 elements.

Fixes e60e6962c503 ("selftests/bpf: Add tests for restricted helpers")
---
  tools/testing/selftests/bpf/test_verifier.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_verifier.c +0 -0
index b0bd2a1f6d52..76cd903117af 100644

tools/testing/selftests/bpf/test_verifier.c line 56

Quoted 5 lines
tools/testing/selftests/bpf/test_verifier.c +1 -1
@@ -53,7 +53,7 @@
  #define MAX_INSNS	BPF_MAXINSNS
  #define MAX_TEST_INSNS	1000000
  #define MAX_FIXUPS	8
-#define MAX_NR_MAPS	21
+#define MAX_NR_MAPS	22

The patch has been fixed by:
https://lore.kernel.org/bpf/[email protected]/
and merged into bpf tree. It should circulate back to bpf-next later when the patch goes from bpf->net->linus->net-next->bpf-next.

Quoted 3 lines
tools/testing/selftests/bpf/test_verifier.c +0 -0
  #define MAX_TEST_RUNS	8
  #define POINTER_VALUE	0xcafe4all
  #define TEST_DATA_LEN	64