Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netdevsim: Don't accept device bound programs

Commit 2b3486bc2d23 ("bpf: Introduce device-bound XDP programs") introduced
device-bound programs by largely reusing existing offloading infrastructure.
This changed the semantics of 'prog->aux->offload' a bit. Now, it's non-NULL
for both offloaded and device-bound programs.

Instead of looking at 'prog->aux->offload' let's call bpf_prog_is_offloaded
which should be true iff the program is offloaded and not merely device-bound.

Fixes: 2b3486bc2d23 ("bpf: Introduce device-bound XDP programs")
Reported-by: syzbot+44c2416196b7c607f226@syzkaller.appspotmail.com
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Cc: Dipendra Khadka <kdipendra88@gmail.com>
Link: https://lore.kernel.org/bpf/20231114045453.1816995-2-sdf@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Stanislav Fomichev and committed by
Alexei Starovoitov
c0c6bde5 d3fa86b1

+2 -2
+2 -2
drivers/net/netdevsim/bpf.c
··· 93 93 { 94 94 struct nsim_bpf_bound_prog *state; 95 95 96 - if (!prog || !prog->aux->offload) 96 + if (!prog || !bpf_prog_is_offloaded(prog->aux)) 97 97 return; 98 98 99 99 state = prog->aux->offload->dev_priv; ··· 311 311 if (!bpf->prog) 312 312 return 0; 313 313 314 - if (!bpf->prog->aux->offload) { 314 + if (!bpf_prog_is_offloaded(bpf->prog->aux)) { 315 315 NSIM_EA(bpf->extack, "xdpoffload of non-bound program"); 316 316 return -EINVAL; 317 317 }