Merge branch 'Avoid dummy bpf_offload_netdev in __bpf_prog_dev_bound_init'

Browse source

Eduard Zingerman says:

====================
For a device bound BPF program with flag BPF_F_XDP_DEV_BOUND_ONLY,
in case if device does not support offload, __bpf_prog_dev_bound_init()
creates a dummy bpf_offload_netdev struct with .offdev field set to NULL.

This dummy struct might be reused for programs without this flag
bound to the same device. However, bpf_prog_offload_verifier_prep()
that uses bpf_offload_netdev assumes that .offdev field cannot be NULL.

This bug was reported by syzbot in [1].

[1] https://lore.kernel.org/bpf/000000000000d97f3c060479c4f8@google.com/
====================

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

...

This commit is contained in:

Martin KaFai Lau 2023-09-11 22:06:06 -07:00

parent a34a9f1a19 e4c3116473

commit 4a490247be

2 changed files with 68 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

kernel/bpf/offload.c

View file

61

tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c

View file