* [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check
@ 2019-10-18 6:09 Alexei Starovoitov
2019-10-18 17:59 ` Yonghong Song
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alexei Starovoitov @ 2019-10-18 6:09 UTC (permalink / raw)
To: davem; +Cc: daniel, netdev, bpf, kernel-team
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 <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
kernel/bpf/syscall.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 523e3ac15a08..16ea3c0db4f6 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check
2019-10-18 6:09 [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check Alexei Starovoitov
@ 2019-10-18 17:59 ` Yonghong Song
2019-10-18 19:10 ` Daniel Borkmann
2019-10-18 23:28 ` Andrii Nakryiko
2 siblings, 0 replies; 4+ messages in thread
From: Yonghong Song @ 2019-10-18 17:59 UTC (permalink / raw)
To: Alexei Starovoitov, davem; +Cc: daniel, netdev, bpf, Kernel Team
On 10/17/19 11:09 PM, Alexei Starovoitov wrote:
> 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 <andriin@fb.com>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
> ---
> kernel/bpf/syscall.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 523e3ac15a08..16ea3c0db4f6 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -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;
> }
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check
2019-10-18 6:09 [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check Alexei Starovoitov
2019-10-18 17:59 ` Yonghong Song
@ 2019-10-18 19:10 ` Daniel Borkmann
2019-10-18 23:28 ` Andrii Nakryiko
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2019-10-18 19:10 UTC (permalink / raw)
To: Alexei Starovoitov; +Cc: davem, netdev, bpf, kernel-team
On Thu, Oct 17, 2019 at 11:09:33PM -0700, Alexei Starovoitov wrote:
> 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 <andriin@fb.com>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check
2019-10-18 6:09 [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check Alexei Starovoitov
2019-10-18 17:59 ` Yonghong Song
2019-10-18 19:10 ` Daniel Borkmann
@ 2019-10-18 23:28 ` Andrii Nakryiko
2 siblings, 0 replies; 4+ messages in thread
From: Andrii Nakryiko @ 2019-10-18 23:28 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: David S. Miller, Daniel Borkmann, Networking, bpf, Kernel Team
On Fri, Oct 18, 2019 at 4:25 PM Alexei Starovoitov <ast@kernel.org> wrote:
>
> Only raw_tracepoint program type can have bpf_attr.attach_btf_id >= 0.
typo: just > (code is actually correct, though)
> 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 <andriin@fb.com>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
> ---
Acked-by: Andrii Nakryiko <andriin@fb.com>
> kernel/bpf/syscall.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 523e3ac15a08..16ea3c0db4f6 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-18 23:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-18 6:09 [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check Alexei Starovoitov
2019-10-18 17:59 ` Yonghong Song
2019-10-18 19:10 ` Daniel Borkmann
2019-10-18 23:28 ` Andrii Nakryiko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).