Skip to content

Commit f9b0e10

Browse files
borkmannanakryiko
authored andcommitted
bpf, mprog: Fix maximum program check on mprog attachment
After Paul's recent improvement to syzkaller to improve coverage for bpf_mprog and tcx, it hit a splat that the program limit was surpassed. What happened is that the maximum number of progs got added, followed by another prog add request which adds with BPF_F_BEFORE flag relative to the last program in the array. The idx >= bpf_mprog_max() check in bpf_mprog_attach() still passes because the index is below the maximum but the maximum will be surpassed. We need to add a check upfront for insertions to catch this situation. Fixes: 053c8e1 ("bpf: Add generic attach/detach/query API for multi-progs") Reported-by: syzbot+baa44e3dbbe48e05c1ad@syzkaller.appspotmail.com Reported-by: syzbot+b97d20ed568ce0951a06@syzkaller.appspotmail.com Reported-by: syzbot+2558ca3567a77b7af4e3@syzkaller.appspotmail.com Co-developed-by: Nikolay Aleksandrov <razor@blackwall.org> Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Tested-by: syzbot+baa44e3dbbe48e05c1ad@syzkaller.appspotmail.com Tested-by: syzbot+b97d20ed568ce0951a06@syzkaller.appspotmail.com Link: google/syzkaller#4207 Link: https://lore.kernel.org/bpf/20230929204121.20305-1-daniel@iogearbox.net
1 parent b80e31b commit f9b0e10

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

kernel/bpf/mprog.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ int bpf_mprog_attach(struct bpf_mprog_entry *entry,
253253
goto out;
254254
}
255255
idx = tidx;
256+
} else if (bpf_mprog_total(entry) == bpf_mprog_max()) {
257+
ret = -ERANGE;
258+
goto out;
256259
}
257260
if (flags & BPF_F_BEFORE) {
258261
tidx = bpf_mprog_pos_before(entry, &rtuple);

0 commit comments

Comments
 (0)