From 11bf829873167d002812fb75dc4546324cc20686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Fri, 4 Nov 2022 09:16:23 -0700 Subject: [PATCH] ci: Remove no longer needed patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch "selftests/bpf: Fix OOB write in test_verifier" has made it to the bpf branch (after originally landing on bpf-next). Remove it from CI, as it is no longer necessary. Signed-off-by: Daniel Müller --- .../001-fix-oob-write-in-test_verifier.diff | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 ci/diffs/001-fix-oob-write-in-test_verifier.diff diff --git a/ci/diffs/001-fix-oob-write-in-test_verifier.diff b/ci/diffs/001-fix-oob-write-in-test_verifier.diff deleted file mode 100644 index eb5ef26..0000000 --- a/ci/diffs/001-fix-oob-write-in-test_verifier.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: Kumar Kartikeya Dwivedi -To: bpf@vger.kernel.org -Cc: Alexei Starovoitov , - Daniel Borkmann , - Andrii Nakryiko -Subject: [PATCH bpf-next] selftests/bpf: Fix OOB write in test_verifier -Date: Tue, 14 Dec 2021 07:18:00 +0530 [thread overview] -Message-ID: <20211214014800.78762-1-memxor@gmail.com> (raw) - -The commit referenced below added fixup_map_timer support (to create a -BPF map containing timers), but failed to increase the size of the -map_fds array, leading to out of bounds write. Fix this by changing -MAX_NR_MAPS to 22. - -Fixes: e60e6962c503 ("selftests/bpf: Add tests for restricted helpers") -Signed-off-by: Kumar Kartikeya Dwivedi ---- - tools/testing/selftests/bpf/test_verifier.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c -index ad5d30bafd93..33e2ecb3bef9 100644 ---- a/tools/testing/selftests/bpf/test_verifier.c -+++ b/tools/testing/selftests/bpf/test_verifier.c -@@ -54,7 +54,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 --- -2.34.1