From: Yonghong Song <yhs@fb.com>
To: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Greg KH <gregkh@linuxfoundation.org>,
Jiri Kosina <jikos@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>, Shuah Khan <shuah@kernel.org>,
Dave Marchevsky <davemarchevsky@fb.com>,
Joe Stringer <joe@cilium.io>, Jonathan Corbet <corbet@lwn.net>
Cc: Tero Kristo <tero.kristo@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org
Subject: Re: [PATCH bpf-next v6 05/23] bpf/verifier: allow kfunc to return an allocated mem
Date: Fri, 15 Jul 2022 21:29:07 -0700 [thread overview]
Message-ID: <7fc49373-55df-c7fd-4a73-c2cf8a62748d@fb.com> (raw)
In-Reply-To: <20220712145850.599666-6-benjamin.tissoires@redhat.com>
On 7/12/22 7:58 AM, Benjamin Tissoires wrote:
> When a kfunc is not returning a pointer to a struct but to a plain type,
> we can consider it is a valid allocated memory assuming that:
> - one of the arguments is either called rdonly_buf_size or
> rdwr_buf_size
> - and this argument is a const from the caller point of view
>
> We can then use this parameter as the size of the allocated memory.
>
> The memory is either read-only or read-write based on the name
> of the size parameter.
If I understand correctly, this permits a kfunc like
int *kfunc(..., int rdonly_buf_size);
...
int *p = kfunc(..., 20);
so the 'p' points to a memory buffer with size 20.
This looks like a strange interface although probably there
is a valid reason for this as I didn't participated in
earlier discussions.
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
>
> ---
>
> changes in v6:
> - code review from Kartikeya:
> - remove comment change that had no reasons to be
> - remove handling of PTR_TO_MEM with kfunc releases
> - introduce struct bpf_kfunc_arg_meta
> - do rdonly/rdwr_buf_size check in btf_check_kfunc_arg_match
> - reverted most of the changes in verifier.c
> - make sure kfunc acquire is using a struct pointer, not just a plain
> pointer
> - also forward ref_obj_id to PTR_TO_MEM in kfunc to not use after free
> the allocated memory
>
> changes in v5:
> - updated PTR_TO_MEM comment in btf.c to match upstream
> - make it read-only or read-write based on the name of size
>
> new in v4
> ---
> include/linux/bpf.h | 10 ++++++-
> include/linux/btf.h | 12 ++++++++
> kernel/bpf/btf.c | 67 ++++++++++++++++++++++++++++++++++++++++---
> kernel/bpf/verifier.c | 49 +++++++++++++++++++++++--------
> 4 files changed, 121 insertions(+), 17 deletions(-)
>
> diff --git a/include/linux/bpf.h b/include/linux/bpf.h
> index 2b21f2a3452f..5b8eadb6e7bc 100644
> --- a/include/linux/bpf.h
> +++ b/include/linux/bpf.h
> @@ -1916,12 +1916,20 @@ int btf_distill_func_proto(struct bpf_verifier_log *log,
> const char *func_name,
> struct btf_func_model *m);
>
> +struct bpf_kfunc_arg_meta {
> + u64 r0_size;
> + bool r0_rdonly;
> + int ref_obj_id;
> + bool multiple_ref_obj_id;
> +};
> +
> struct bpf_reg_state;
> int btf_check_subprog_arg_match(struct bpf_verifier_env *env, int subprog,
> struct bpf_reg_state *regs);
> int btf_check_kfunc_arg_match(struct bpf_verifier_env *env,
> const struct btf *btf, u32 func_id,
> - struct bpf_reg_state *regs);
> + struct bpf_reg_state *regs,
> + struct bpf_kfunc_arg_meta *meta);
> int btf_prepare_func_args(struct bpf_verifier_env *env, int subprog,
> struct bpf_reg_state *reg);
> int btf_check_type_match(struct bpf_verifier_log *log, const struct bpf_prog *prog,
> diff --git a/include/linux/btf.h b/include/linux/btf.h
> index 1bfed7fa0428..31da4273c2ec 100644
> --- a/include/linux/btf.h
> +++ b/include/linux/btf.h
> @@ -420,4 +420,16 @@ static inline int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dt
> }
> #endif
>
> +static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t)
> +{
> + /* t comes in already as a pointer */
> + t = btf_type_by_id(btf, t->type);
> +
> + /* allow const */
> + if (BTF_INFO_KIND(t->info) == BTF_KIND_CONST)
> + t = btf_type_by_id(btf, t->type);
> +
> + return btf_type_is_struct(t);
> +}
> +
> #endif
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 4423045b8ff3..552d7bc05a0c 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -6168,10 +6168,36 @@ static bool is_kfunc_arg_mem_size(const struct btf *btf,
> return true;
> }
>
> +static bool btf_is_kfunc_arg_mem_size(const struct btf *btf,
> + const struct btf_param *arg,
> + const struct bpf_reg_state *reg,
> + const char *name)
> +{
> + int len, target_len = strlen(name);
> + const struct btf_type *t;
> + const char *param_name;
> +
> + t = btf_type_skip_modifiers(btf, arg->type, NULL);
> + if (!btf_type_is_scalar(t) || reg->type != SCALAR_VALUE)
> + return false;
> +
> + param_name = btf_name_by_offset(btf, arg->name_off);
> + if (str_is_empty(param_name))
> + return false;
> + len = strlen(param_name);
> + if (len != target_len)
> + return false;
> + if (strncmp(param_name, name, target_len))
strcmp(param_name, name) is enough. len == target_len and both len and
target_len is computed from strlen(...).
> + return false;
> +
> + return true;
> +}
> +
> static int btf_check_func_arg_match(struct bpf_verifier_env *env,
> const struct btf *btf, u32 func_id,
> struct bpf_reg_state *regs,
> - bool ptr_to_mem_ok)
> + bool ptr_to_mem_ok,
> + struct bpf_kfunc_arg_meta *kfunc_meta)
> {
> enum bpf_prog_type prog_type = resolve_prog_type(env->prog);
> struct bpf_verifier_log *log = &env->log;
> @@ -6225,6 +6251,30 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
>
> t = btf_type_skip_modifiers(btf, args[i].type, NULL);
> if (btf_type_is_scalar(t)) {
> + if (is_kfunc && kfunc_meta) {
> + bool is_buf_size = false;
> +
> + /* check for any const scalar parameter of name "rdonly_buf_size"
> + * or "rdwr_buf_size"
> + */
> + if (btf_is_kfunc_arg_mem_size(btf, &args[i], reg,
> + "rdonly_buf_size")) {
> + kfunc_meta->r0_rdonly = true;
> + is_buf_size = true;
> + } else if (btf_is_kfunc_arg_mem_size(btf, &args[i], reg,
> + "rdwr_buf_size"))
> + is_buf_size = true;
> +
> + if (is_buf_size) {
> + if (kfunc_meta->r0_size) {
> + bpf_log(log, "2 or more rdonly/rdwr_buf_size parameters for kfunc");
> + return -EINVAL;
> + }
> +
> + kfunc_meta->r0_size = reg->var_off.value;
Did we check 'reg' is a constant somewhere?
> + }
> + }
> +
> if (reg->type == SCALAR_VALUE)
> continue;
> bpf_log(log, "R%d is not a scalar\n", regno);
> @@ -6246,6 +6296,14 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
> if (ret < 0)
> return ret;
>
> + /* kptr_get is only valid for kfunc */
> + if (kfunc_meta && reg->ref_obj_id) {
> + /* check for any one ref_obj_id to keep track of memory */
> + if (kfunc_meta->ref_obj_id)
> + kfunc_meta->multiple_ref_obj_id = true;
> + kfunc_meta->ref_obj_id = reg->ref_obj_id;
> + }
> +
> /* kptr_get is only true for kfunc */
> if (i == 0 && kptr_get) {
> struct bpf_map_value_off_desc *off_desc;
> @@ -6441,7 +6499,7 @@ int btf_check_subprog_arg_match(struct bpf_verifier_env *env, int subprog,
> return -EINVAL;
>
> is_global = prog->aux->func_info_aux[subprog].linkage == BTF_FUNC_GLOBAL;
> - err = btf_check_func_arg_match(env, btf, btf_id, regs, is_global);
> + err = btf_check_func_arg_match(env, btf, btf_id, regs, is_global, NULL);
>
> /* Compiler optimizations can remove arguments from static functions
> * or mismatched type can be passed into a global function.
[...]
next prev parent reply other threads:[~2022-07-16 4:29 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 14:58 [PATCH bpf-next v6 00/23] Introduce eBPF support for HID devices Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 01/23] selftests/bpf: fix config for CLS_BPF Benjamin Tissoires
2022-07-15 23:55 ` Yonghong Song
2022-07-12 14:58 ` [PATCH bpf-next v6 02/23] bpf/verifier: allow kfunc to read user provided context Benjamin Tissoires
2022-07-15 23:56 ` Yonghong Song
2022-07-16 19:47 ` Kumar Kartikeya Dwivedi
2022-07-18 13:53 ` Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 03/23] bpf/verifier: do not clear meta in check_mem_size Benjamin Tissoires
2022-07-16 0:03 ` Yonghong Song
2022-07-12 14:58 ` [PATCH bpf-next v6 04/23] selftests/bpf: add test for accessing ctx from syscall program type Benjamin Tissoires
2022-07-16 0:17 ` Yonghong Song
2022-07-12 14:58 ` [PATCH bpf-next v6 05/23] bpf/verifier: allow kfunc to return an allocated mem Benjamin Tissoires
2022-07-16 4:29 ` Yonghong Song [this message]
2022-07-18 14:36 ` Benjamin Tissoires
2022-07-19 16:05 ` Yonghong Song
2022-07-16 20:32 ` Kumar Kartikeya Dwivedi
2022-07-18 15:28 ` Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 06/23] selftests/bpf: Add tests for kfunc returning a memory pointer Benjamin Tissoires
2022-07-16 4:33 ` Yonghong Song
2022-07-18 8:42 ` Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 07/23] bpf: prepare for more bpf syscall to be used from kernel and user space Benjamin Tissoires
2022-07-16 4:37 ` Yonghong Song
2022-07-12 14:58 ` [PATCH bpf-next v6 08/23] libbpf: add map_get_fd_by_id and map_delete_elem in light skeleton Benjamin Tissoires
2022-07-16 4:41 ` Yonghong Song
2022-07-12 14:58 ` [PATCH bpf-next v6 09/23] HID: core: store the unique system identifier in hid_device Benjamin Tissoires
2022-07-15 5:00 ` Greg KH
2022-07-12 14:58 ` [PATCH bpf-next v6 10/23] HID: export hid_report_type to uapi Benjamin Tissoires
2022-07-15 5:00 ` Greg KH
2022-07-12 14:58 ` [PATCH bpf-next v6 11/23] HID: convert defines of HID class requests into a proper enum Benjamin Tissoires
2022-07-15 5:01 ` Greg KH
2022-07-12 14:58 ` [PATCH bpf-next v6 12/23] HID: initial BPF implementation Benjamin Tissoires
2022-07-13 8:48 ` Quentin Monnet
2022-07-13 11:36 ` Benjamin Tissoires
2022-07-15 5:02 ` Greg KH
2022-07-15 9:56 ` Benjamin Tissoires
2022-07-15 11:43 ` Greg KH
2022-07-12 14:58 ` [PATCH bpf-next v6 13/23] selftests/bpf: add tests for the HID-bpf initial implementation Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 14/23] HID: bpf: allocate data memory for device_event BPF programs Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 15/23] selftests/bpf/hid: add test to change the report size Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 16/23] HID: bpf: introduce hid_hw_request() Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 17/23] selftests/bpf: add tests for bpf_hid_hw_request Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 18/23] HID: bpf: allow to change the report descriptor Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 19/23] selftests/bpf: add report descriptor fixup tests Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 20/23] selftests/bpf: Add a test for BPF_F_INSERT_HEAD Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 21/23] samples/bpf: add new hid_mouse example Benjamin Tissoires
2022-07-13 12:06 ` Dominique Martinet
2022-07-13 12:32 ` Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 22/23] HID: bpf: add Surface Dial example Benjamin Tissoires
2022-07-12 14:58 ` [PATCH bpf-next v6 23/23] Documentation: add HID-BPF docs Benjamin Tissoires
2022-07-14 21:39 ` [PATCH bpf-next v6 00/23] Introduce eBPF support for HID devices Alexei Starovoitov
2022-07-15 17:34 ` Kumar Kartikeya Dwivedi
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=7fc49373-55df-c7fd-4a73-c2cf8a62748d@fb.com \
--to=yhs@fb.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=benjamin.tissoires@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=daniel@iogearbox.net \
--cc=davemarchevsky@fb.com \
--cc=gregkh@linuxfoundation.org \
--cc=jikos@kernel.org \
--cc=joe@cilium.io \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--cc=tero.kristo@linux.intel.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;
as well as URLs for NNTP newsgroup(s).