bpf: fix bpf_attr.attach_btf_id check
Subsystems (4)
Alexei Starovoitov
maintainerPATCH 1/1 bpf: fix bpf_attr.attach_btf_id check
Only raw_tracepoint program type can have bpf_attr.attach_btf_id >= 0. Make sure to reject other program types that accidentally set it to non-zero.
Fixes ccfe29eb29c2 ("bpf: Add attach_btf_id attribute to program load")
Reported-by Andrii Nakryiko <[email protected]>
Signed-off-by Alexei Starovoitov <[email protected]>
--- kernel/bpf/syscall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
kernel/bpf/syscall.c +11 -6
@@ -1570,6 +1570,17 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, enum bpf_attach_type expected_attach_type, u32 btf_id) { + switch (prog_type) { +case BPF_PROG_TYPE_RAW_TRACEPOINT : +if (btf_id >BTF_MAX_TYPE ) +return -EINVAL ; +break ; +default : +if (btf_id) +return -EINVAL ; +break ; + } +switch (prog_type) {case BPF_PROG_TYPE_CGROUP_SOCK :switch (expected_attach_type) {
@@ -1610,13 +1621,7 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type,default :return -EINVAL ; } -case BPF_PROG_TYPE_RAW_TRACEPOINT : -if (btf_id >BTF_MAX_TYPE ) -return -EINVAL ; -return 0 ;default : -if (btf_id) -return -EINVAL ;return 0 ; } }
Signature · 1 line
2.17.1
Quoted 6 lines · Alexei Starovoitov
Only
raw_tracepointprogram type can have bpf_attr.attach_btf_id >= 0. Make sure to reject other program types that accidentally set it to non-zero.Fixes ccfe29eb29c2 ("bpf: Add attach_btf_id attribute to program load")Reported-by Andrii Nakryiko <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
Acked-by Yonghong Song <[email protected]>
Quoted 41 lines
--- kernel/bpf/syscall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)kernel/bpf/syscall.c +11
-6@@ -1570,6 +1570,17 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, enum bpf_attach_type expected_attach_type, u32 btf_id) { + switch (prog_type) { +case BPF_PROG_TYPE_RAW_TRACEPOINT : +if (btf_id >BTF_MAX_TYPE ) +return -EINVAL ; +break ; +default : +if (btf_id) +return -EINVAL ; +break ; + } +switch (prog_type) {case BPF_PROG_TYPE_CGROUP_SOCK :switch (expected_attach_type) {@@ -1610,13 +1621,7 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type,default :return -EINVAL ; } -case BPF_PROG_TYPE_RAW_TRACEPOINT : -if (btf_id >BTF_MAX_TYPE ) -return -EINVAL ; -return 0 ;default : -if (btf_id) -return -EINVAL ;return 0 ; } }
Quoted 6 lines · Alexei Starovoitov
Only
raw_tracepointprogram type can have bpf_attr.attach_btf_id >= 0. Make sure to reject other program types that accidentally set it to non-zero.Fixes ccfe29eb29c2 ("bpf: Add attach_btf_id attribute to program load")Reported-by Andrii Nakryiko <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
Applied, thanks!
Quoted 2 lines · Alexei Starovoitov
Only
raw_tracepointprogram type can have bpf_attr.attach_btf_id >= 0.
typo: just > (code is actually correct, though)
Quoted 6 lines
Make sure to reject other program types that accidentally set it to non-zero.
Fixes ccfe29eb29c2 ("bpf: Add attach_btf_id attribute to program load")Reported-by Andrii Nakryiko <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>---
Acked-by Andrii Nakryiko <[email protected]>
Quoted 42 lines
kernel/bpf/syscall.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)kernel/bpf/syscall.c +11
-7@@ -1570,6 +1570,17 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, enum bpf_attach_type expected_attach_type, u32 btf_id) { + switch (prog_type) { +case BPF_PROG_TYPE_RAW_TRACEPOINT : +if (btf_id >BTF_MAX_TYPE ) +return -EINVAL ; +break ; +default : +if (btf_id) +return -EINVAL ; +break ; + } +switch (prog_type) {case BPF_PROG_TYPE_CGROUP_SOCK :switch (expected_attach_type) {@@ -1610,13 +1621,7 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type,default :return -EINVAL ; } -case BPF_PROG_TYPE_RAW_TRACEPOINT : -if (btf_id >BTF_MAX_TYPE ) -return -EINVAL ; -return 0 ;default : -if (btf_id) -return -EINVAL ;return 0 ; } } --2.17.1