diff mbox series

[bpf-next] bpf: Remove tst_run from lwt_seg6local_prog_ops.

Message ID 20240710141631.FbmHcQaX@linutronix.de (mailing list archive)
State Accepted
Commit c13fda93aca118b8e5cd202e339046728ee7dddb
Delegated to: BPF
Headers show
Series [bpf-next] bpf: Remove tst_run from lwt_seg6local_prog_ops. | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-7 fail Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 fail Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
netdev/tree_selection success Clearly marked for bpf-next
netdev/apply success Patch already applied to bpf-next-0

Commit Message

Sebastian Andrzej Siewior July 10, 2024, 2:16 p.m. UTC 
The syzbot reported that the lwt_seg6 related BPF ops can be invoked
via bpf_test_run() without without entering input_action_end_bpf()
first.

Martin KaFai Lau said that self test for BPF_PROG_TYPE_LWT_SEG6LOCAL
probably didn't work since it was introduced in commit 04d4b274e2a
("ipv6: sr: Add seg6local action End.BPF"). The reason is that the
per-CPU variable seg6_bpf_srh_states::srh is never assigned in the self
test case but each BPF function expects it.

Remove test_run for BPF_PROG_TYPE_LWT_SEG6LOCAL.

Suggested-by: Martin KaFai Lau <martin.lau@linux.dev>
Reported-by: syzbot+608a2acde8c5a101d07d@syzkaller.appspotmail.com
Fixes: d1542d4ae4df ("seg6: Use nested-BH locking for seg6_bpf_srh_states.")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 net/core/filter.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Daniel Borkmann July 10, 2024, 3:16 p.m. UTC | #1 
On 7/10/24 4:16 PM, Sebastian Andrzej Siewior wrote:
> The syzbot reported that the lwt_seg6 related BPF ops can be invoked
> via bpf_test_run() without without entering input_action_end_bpf()
> first.
> 
> Martin KaFai Lau said that self test for BPF_PROG_TYPE_LWT_SEG6LOCAL
> probably didn't work since it was introduced in commit 04d4b274e2a
> ("ipv6: sr: Add seg6local action End.BPF"). The reason is that the
> per-CPU variable seg6_bpf_srh_states::srh is never assigned in the self
> test case but each BPF function expects it.
> 
> Remove test_run for BPF_PROG_TYPE_LWT_SEG6LOCAL.
> 
> Suggested-by: Martin KaFai Lau <martin.lau@linux.dev>
> Reported-by: syzbot+608a2acde8c5a101d07d@syzkaller.appspotmail.com
> Fixes: d1542d4ae4df ("seg6: Use nested-BH locking for seg6_bpf_srh_states.")

We can also add in addition for reference:

Fixes: 004d4b274e2a ("ipv6: sr: Add seg6local action End.BPF")

> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Acked-by: Daniel Borkmann <daniel@iogearbox.net>
patchwork-bot+netdevbpf@kernel.org July 10, 2024, 5:10 p.m. UTC | #2 
Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <martin.lau@kernel.org>:

On Wed, 10 Jul 2024 16:16:31 +0200 you wrote:
> The syzbot reported that the lwt_seg6 related BPF ops can be invoked
> via bpf_test_run() without without entering input_action_end_bpf()
> first.
> 
> Martin KaFai Lau said that self test for BPF_PROG_TYPE_LWT_SEG6LOCAL
> probably didn't work since it was introduced in commit 04d4b274e2a
> ("ipv6: sr: Add seg6local action End.BPF"). The reason is that the
> per-CPU variable seg6_bpf_srh_states::srh is never assigned in the self
> test case but each BPF function expects it.
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpf: Remove tst_run from lwt_seg6local_prog_ops.
    https://git.kernel.org/bpf/bpf-next/c/c13fda93aca1

You are awesome, thank you!
Martin KaFai Lau July 10, 2024, 5:13 p.m. UTC | #3 
On 7/10/24 8:16 AM, Daniel Borkmann wrote:
> On 7/10/24 4:16 PM, Sebastian Andrzej Siewior wrote:
>> The syzbot reported that the lwt_seg6 related BPF ops can be invoked
>> via bpf_test_run() without without entering input_action_end_bpf()
>> first.
>>
>> Martin KaFai Lau said that self test for BPF_PROG_TYPE_LWT_SEG6LOCAL
>> probably didn't work since it was introduced in commit 04d4b274e2a
>> ("ipv6: sr: Add seg6local action End.BPF"). The reason is that the
>> per-CPU variable seg6_bpf_srh_states::srh is never assigned in the self
>> test case but each BPF function expects it.
>>
>> Remove test_run for BPF_PROG_TYPE_LWT_SEG6LOCAL.
>>
>> Suggested-by: Martin KaFai Lau <martin.lau@linux.dev>
>> Reported-by: syzbot+608a2acde8c5a101d07d@syzkaller.appspotmail.com
>> Fixes: d1542d4ae4df ("seg6: Use nested-BH locking for seg6_bpf_srh_states.")
> 
> We can also add in addition for reference:
> 
> Fixes: 004d4b274e2a ("ipv6: sr: Add seg6local action End.BPF")

Added the Fixes tag before applying.

Thanks!
diff mbox series

Patch

diff --git a/net/core/filter.c b/net/core/filter.c
index d767880c276d9..4cf1d34f76172 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -11053,7 +11053,6 @@  const struct bpf_verifier_ops lwt_seg6local_verifier_ops = {
 };
 
 const struct bpf_prog_ops lwt_seg6local_prog_ops = {
-	.test_run		= bpf_prog_test_run_skb,
 };
 
 const struct bpf_verifier_ops cg_sock_verifier_ops = {