From: John Fastabend <john.fastabend@gmail.com>
To: Jiri Olsa <jolsa@kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
"Andrii Nakryiko" <andriin@fb.com>, "Yonghong Song" <yhs@fb.com>,
"Martin KaFai Lau" <kafai@fb.com>,
"Jakub Kicinski" <jakub.kicinski@netronome.com>,
"David Miller" <davem@redhat.com>,
"Björn Töpel" <bjorn.topel@intel.com>
Subject: RE: [PATCH 1/6] bpf: Allow ctx access for pointers to scalar
Date: Mon, 20 Jan 2020 16:24:01 -0800 [thread overview]
Message-ID: <5e2644a144e2c_20912afc5c86e5c4cc@john-XPS-13-9370.notmuch> (raw)
In-Reply-To: <20200118134945.493811-2-jolsa@kernel.org>
Jiri Olsa wrote:
> When accessing the context we allow access to arguments with
> scalar type and pointer to struct. But we omit pointer to scalar
> type, which is the case for many functions and same case as
> when accessing scalar.
>
> Adding the check if the pointer is to scalar type and allow it.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> kernel/bpf/btf.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 832b5d7fd892..207ae554e0ce 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -3668,7 +3668,7 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,
> const struct bpf_prog *prog,
> struct bpf_insn_access_aux *info)
> {
> - const struct btf_type *t = prog->aux->attach_func_proto;
> + const struct btf_type *tp, *t = prog->aux->attach_func_proto;
> struct bpf_prog *tgt_prog = prog->aux->linked_prog;
> struct btf *btf = bpf_prog_get_target_btf(prog);
> const char *tname = prog->aux->attach_func_name;
> @@ -3730,6 +3730,17 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,
> */
> return true;
>
> + tp = btf_type_by_id(btf, t->type);
> + /* skip modifiers */
> + while (btf_type_is_modifier(tp))
> + tp = btf_type_by_id(btf, tp->type);
> +
> + if (btf_type_is_int(tp) || btf_type_is_enum(tp))
> + /* This is a pointer scalar.
> + * It is the same as scalar from the verifier safety pov.
> + */
> + return true;
> +
> /* this is a pointer to another type */
> info->reg_type = PTR_TO_BTF_ID;
>
Acked-by: John Fastabend <john.fastabend@gmail.com>
next prev parent reply other threads:[~2020-01-21 0:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-18 13:49 [PATCHv2 0/6] bpf: Add trampoline helpers Jiri Olsa
2020-01-18 13:49 ` [PATCH 1/6] bpf: Allow ctx access for pointers to scalar Jiri Olsa
2020-01-21 0:24 ` John Fastabend [this message]
2020-01-18 13:49 ` [PATCH 2/6] bpf: Add bpf_perf_event_output_kfunc Jiri Olsa
2020-01-18 13:49 ` [PATCH 3/6] bpf: Add bpf_get_stackid_kfunc Jiri Olsa
2020-01-18 13:49 ` [PATCH 4/6] bpf: Add bpf_get_stack_kfunc Jiri Olsa
2020-01-18 13:49 ` [PATCH 5/6] bpf: Allow to resolve bpf trampoline and dispatcher in unwind Jiri Olsa
2020-01-20 23:55 ` Daniel Borkmann
2020-01-21 9:56 ` Jiri Olsa
2020-01-18 13:49 ` [PATCH 6/6] selftest/bpf: Add test for allowed trampolines count Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2020-01-21 12:05 [PATCHv3 0/6] bpf: Add trampoline helpers Jiri Olsa
2020-01-21 12:05 ` [PATCH 1/6] bpf: Allow ctx access for pointers to scalar Jiri Olsa
2020-01-22 1:51 ` Alexei Starovoitov
2020-01-22 2:33 ` Yonghong Song
2020-01-22 9:13 ` Jiri Olsa
2020-01-22 16:09 ` Alexei Starovoitov
2020-01-22 21:18 ` Jiri Olsa
2020-01-23 1:16 ` Alexei Starovoitov
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=5e2644a144e2c_20912afc5c86e5c4cc@john-XPS-13-9370.notmuch \
--to=john.fastabend@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@redhat.com \
--cc=jakub.kicinski@netronome.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=yhs@fb.com \
/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