From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH bpf-next] bpf: fix bpf_attr.attach_btf_id check
Date: Fri, 18 Oct 2019 16:28:19 -0700 [thread overview]
Message-ID: <CAEf4BzZKTHMqyTsLk-4ysjyRpN1sRN_vK1yn5HfAFWfqKZ=B-g@mail.gmail.com> (raw)
In-Reply-To: <20191018060933.2950231-1-ast@kernel.org>
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
>
prev parent reply other threads:[~2019-10-18 23:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEf4BzZKTHMqyTsLk-4ysjyRpN1sRN_vK1yn5HfAFWfqKZ=B-g@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).