From: thinker.li@gmail.com
To: bpf@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev,
song@kernel.org, kernel-team@meta.com, andrii@kernel.org
Cc: sinquersw@gmail.com, kuifeng@meta.com,
Kui-Feng Lee <thinker.li@gmail.com>
Subject: [RFC bpf-next v3 06/11] bpf: validate value_type
Date: Wed, 20 Sep 2023 08:59:18 -0700 [thread overview]
Message-ID: <20230920155923.151136-7-thinker.li@gmail.com> (raw)
In-Reply-To: <20230920155923.151136-1-thinker.li@gmail.com>
From: Kui-Feng Lee <thinker.li@gmail.com>
A value_type should has three members; refcnt, state, and data.
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
---
kernel/bpf/bpf_struct_ops.c | 75 +++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index ef8a1edec891..fb684d2ee99d 100644
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -99,6 +99,79 @@ const struct bpf_prog_ops bpf_struct_ops_prog_ops = {
static const struct btf_type *module_type;
+static bool check_value_member(struct btf *btf,
+ const struct btf_member *member,
+ int index,
+ const char *value_name,
+ const char *name, const char *type_name,
+ u16 kind)
+{
+ const char *mname, *mtname;
+ const struct btf_type *mt;
+ s32 mtype_id;
+
+ mname = btf_name_by_offset(btf, member->name_off);
+ if (!*mname) {
+ pr_warn("The member %d of %s should have a name\n",
+ index, value_name);
+ return false;
+ }
+ if (strcmp(mname, name)) {
+ pr_warn("The member %d of %s should be refcnt\n",
+ index, value_name);
+ return false;
+ }
+ mtype_id = member->type;
+ mt = btf_type_by_id(btf, mtype_id);
+ mtname = btf_name_by_offset(btf, mt->name_off);
+ if (!*mtname) {
+ pr_warn("The type of the member %d of %s should have a name\n",
+ index, value_name);
+ return false;
+ }
+ if (strcmp(mtname, type_name)) {
+ pr_warn("The type of the member %d of %s should be refcount_t\n",
+ index, value_name);
+ return false;
+ }
+ if (btf_kind(mt) != kind) {
+ pr_warn("The type of the member %d of %s should be %d\n",
+ index, value_name, btf_kind(mt));
+ return false;
+ }
+
+ return true;
+}
+
+static bool is_valid_value_type(struct btf *btf, s32 value_id,
+ const char *type_name, const char *value_name)
+{
+ const struct btf_member *member;
+ const struct btf_type *vt;
+
+ vt = btf_type_by_id(btf, value_id);
+ if (btf_vlen(vt) != 3) {
+ pr_warn("The number of %s's members should be 3, but we get %d\n",
+ value_name, btf_vlen(vt));
+ return false;
+ }
+ member = btf_type_member(vt);
+ if (!check_value_member(btf, member, 0, value_name,
+ "refcnt", "refcount_t", BTF_KIND_TYPEDEF))
+ return false;
+ member++;
+ if (!check_value_member(btf, member, 1, value_name,
+ "state", "bpf_struct_ops_state",
+ BTF_KIND_ENUM))
+ return false;
+ member++;
+ if (!check_value_member(btf, member, 2, value_name,
+ "data", type_name, BTF_KIND_STRUCT))
+ return false;
+
+ return true;
+}
+
static void bpf_struct_ops_init_one(struct bpf_struct_ops *st_ops,
struct btf *btf,
struct bpf_verifier_log *log)
@@ -125,6 +198,8 @@ static void bpf_struct_ops_init_one(struct bpf_struct_ops *st_ops,
value_name);
return;
}
+ if (!is_valid_value_type(btf, value_id, st_ops->name, value_name))
+ return;
type_id = btf_find_by_name_kind(btf, st_ops->name,
BTF_KIND_STRUCT);
--
2.34.1
next prev parent reply other threads:[~2023-09-20 16:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 15:59 [RFC bpf-next v3 00/11] Registrating struct_ops types from modules thinker.li
2023-09-20 15:59 ` [RFC bpf-next v3 01/11] bpf: refactory struct_ops type initialization to a function thinker.li
2023-09-20 15:59 ` [RFC bpf-next v3 02/11] bpf: add struct_ops_tab to btf thinker.li
2023-09-25 21:10 ` Martin KaFai Lau
2023-09-25 21:45 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 03/11] bpf: add register and unregister functions for struct_ops thinker.li
2023-09-25 23:07 ` Martin KaFai Lau
2023-09-25 23:13 ` Kui-Feng Lee
2023-09-25 23:31 ` Martin KaFai Lau
2023-09-26 0:19 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 04/11] bpf: attach a module BTF to a bpf_struct_ops thinker.li
2023-09-25 22:57 ` Martin KaFai Lau
2023-09-25 23:25 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 05/11] bpf: hold module for bpf_struct_ops_map thinker.li
2023-09-25 23:23 ` Martin KaFai Lau
2023-09-25 23:42 ` Kui-Feng Lee
2023-09-20 15:59 ` thinker.li [this message]
2023-09-26 1:03 ` [RFC bpf-next v3 06/11] bpf: validate value_type Martin KaFai Lau
2023-09-27 20:27 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 07/11] bpf, net: switch to storing struct_ops in btf thinker.li
2023-09-26 0:02 ` Martin KaFai Lau
2023-09-26 0:18 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 08/11] bpf: pass attached BTF to find correct type info of struct_ops progs thinker.li
2023-09-25 22:58 ` Andrii Nakryiko
2023-09-25 23:50 ` Kui-Feng Lee
2023-09-26 0:24 ` Martin KaFai Lau
2023-09-26 0:58 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 09/11] libbpf: Find correct module BTFs for struct_ops maps and progs thinker.li
2023-09-25 23:09 ` Andrii Nakryiko
2023-09-26 0:12 ` Kui-Feng Lee
2023-09-20 15:59 ` [RFC bpf-next v3 10/11] bpf: export btf_ctx_access to modules thinker.li
2023-09-20 15:59 ` [RFC bpf-next v3 11/11] selftests/bpf: test case for register_bpf_struct_ops() thinker.li
2023-09-26 1:19 ` Martin KaFai Lau
2023-09-26 1:33 ` [RFC bpf-next v3 00/11] Registrating struct_ops types from modules Martin KaFai Lau
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=20230920155923.151136-7-thinker.li@gmail.com \
--to=thinker.li@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=kernel-team@meta.com \
--cc=kuifeng@meta.com \
--cc=martin.lau@linux.dev \
--cc=sinquersw@gmail.com \
--cc=song@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