bpf: Force kprobe multi expected_attach_type for kprobe_multi link
Jiri Olsa
reviewerPATCH v2 1/1 bpf: Force kprobe multi expected_attach_type for kprobe_multi link
We currently allow to create perf link for program with expected_attach_type == BPF_TRACE_KPROBE_MULTI.
This will cause crash when we call helpers like get_attach_cookie or get_func_ip in such program, because it will call the kprobe_multi's version (current->bpf_ctx context setup) of those helpers while it expects perf_link's current->bpf_ctx context setup.
Making sure that we use BPF_TRACE_KPROBE_MULTI expected_attach_type only for programs attaching through kprobe_multi link.
--- kernel/bpf/syscall.c | 5 +++++ 1 file changed, 5 insertions(+)
v2 changes:
- moved the check to bpf_prog_attach_check_attach_type [Andrii]
kernel/bpf/syscall.c +5 -0
@@ -3440,6 +3440,11 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,return prog->enforce_expected_attach_type && prog->expected_attach_type != attach_type ? -EINVAL :0 ; +case BPF_PROG_TYPE_KPROBE : +if (prog->expected_attach_type ==BPF_TRACE_KPROBE_MULTI && + attach_type !=BPF_TRACE_KPROBE_MULTI ) +return -EINVAL ; + fallthrough;default :return 0 ; }
Signature · 1 line
2.41.0
Quoted 26 lines · Jiri Olsa
We currently allow to create perf link for program with
expected_attach_type==BPF_TRACE_KPROBE_MULTI.This will cause crash when we call helpers like
get_attach_cookieorget_func_ipin such program, because it will call the kprobe_multi's version (current->bpf_ctxcontext setup) of those helpers while it expects perf_link'scurrent->bpf_ctxcontext setup.Making sure that we use
BPF_TRACE_KPROBE_MULTIexpected_attach_typeonly for programs attaching throughkprobe_multilink.Fixes ca74823c6e16 ("bpf: Add cookie support to programs attached with kprobe multi link")Signed-off-by Jiri Olsa <[email protected]>--- kernel/bpf/syscall.c | 5 +++++ 1 file changed, 5 insertions(+)v2 changes:
- moved the check tobpf_prog_attach_check_attach_type[Andrii]kernel/bpf/syscall.c +0
-0
kernel/bpf/syscall.c static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog, · line 3447
Quoted 8 lines
kernel/bpf/syscall.c +5
-0@@ -3440,6 +3440,11 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,return prog->enforce_expected_attach_type && prog->expected_attach_type != attach_type ? -EINVAL :0 ; +case BPF_PROG_TYPE_KPROBE : +if (prog->expected_attach_type ==BPF_TRACE_KPROBE_MULTI && + attach_type !=BPF_TRACE_KPROBE_MULTI ) +return -EINVAL ; + fallthrough;
there is no point in falling through (other branches return without falling through as well), so I replaced this with return 0; and applied to bpf tree, thanks.
Quoted 6 lines
kernel/bpf/syscall.c +0
-1default :return 0 ; } --2.41.0