Skip to content

Commit c0c6bde

Browse files
fomichevAlexei Starovoitov
authored andcommitted
netdevsim: Don't accept device bound programs
Commit 2b3486b ("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: 2b3486b ("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>
1 parent d3fa86b commit c0c6bde

File tree

1 file changed

+2
-2
lines changed
  • drivers/net/netdevsim

1 file changed

+2
-2
lines changed

drivers/net/netdevsim/bpf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static void nsim_prog_set_loaded(struct bpf_prog *prog, bool loaded)
9393
{
9494
struct nsim_bpf_bound_prog *state;
9595

96-
if (!prog || !prog->aux->offload)
96+
if (!prog || !bpf_prog_is_offloaded(prog->aux))
9797
return;
9898

9999
state = prog->aux->offload->dev_priv;
@@ -311,7 +311,7 @@ nsim_setup_prog_hw_checks(struct netdevsim *ns, struct netdev_bpf *bpf)
311311
if (!bpf->prog)
312312
return 0;
313313

314-
if (!bpf->prog->aux->offload) {
314+
if (!bpf_prog_is_offloaded(bpf->prog->aux)) {
315315
NSIM_EA(bpf->extack, "xdpoffload of non-bound program");
316316
return -EINVAL;
317317
}

0 commit comments

Comments
 (0)