From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Yonghong Song <yhs@fb.com>
Cc: ast@fb.com, daniel@iogearbox.net, netdev@vger.kernel.org,
kafai@fb.com, kernel-team@fb.com
Subject: Re: [PATCH bpf-next 1/3] bpf: btf: check name validity for various types
Date: Tue, 27 Nov 2018 11:02:02 -0800 [thread overview]
Message-ID: <20181127190200.dszlrvtmdzkwbeqs@ast-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20181127051715.1845528-2-yhs@fb.com>
On Mon, Nov 26, 2018 at 09:17:13PM -0800, Yonghong Song wrote:
> Commit 2667a2626f4d ("bpf: btf: Add BTF_KIND_FUNC
> and BTF_KIND_FUNC_PROTO") checked the name validity
> for BTF_KIND_FUNC/BTF_KIND_FUNC_PROTO types such that:
> . BTF_KIND_FUNC must have a valid identifier name
> . BTF_KIND_PROTO must have a null name
> . The argument name of BTF_KIND_FUNC/BTF_KIND_FUNC_PROTO,
> if not null, must be a valid identifier.
>
> This patch added name checking for the following types:
> . BTF_KIND_PTR, BTF_KIND_ARRAY, BTF_KIND_VOLATILE,
> BTF_KIND_CONST, BTF_KIND_RESTRICT:
> the name must be null
> . BTF_KIND_STRUCT, BTF_KIND_UNION: the struct/member name
> is either null or a valid identifier
> . BTF_KIND_ENUM: the enum type name is either null or a valid
> identifier; the enumerator name must be a valid identifier.
> . BTF_KIND_FWD: the name must be a valid identifier
> . BTF_KIND_TYPEDEF: the name must be a valid identifier
>
> For those places a valid name is required, the name must be
> a valid C identifier. This can be relaxed later if we found
> use cases for a different (non-C) frontend.
>
> Acked-by: Martin KaFai Lau <kafai@fb.com>
> Signed-off-by: Yonghong Song <yhs@fb.com>
...
> return 0;
> @@ -1409,6 +1432,12 @@ static s32 btf_array_check_meta(struct btf_verifier_env *env,
> return -EINVAL;
> }
>
> + /* array type should not have a name */
> + if (t->name_off) {
> + btf_verifier_log_type(env, t, "Invalid name");
> + return -EINVAL;
> + }
> +
> if (btf_type_vlen(t)) {
> btf_verifier_log_type(env, t, "vlen != 0");
> return -EINVAL;
> @@ -1585,6 +1614,13 @@ static s32 btf_struct_check_meta(struct btf_verifier_env *env,
> return -EINVAL;
> }
>
> + /* struct type either no name or a valid one */
> + if (t->name_off &&
> + !btf_name_valid_identifier(env->btf, t->name_off)) {
Looks like some of these changes need to go into bpf tree.
please split it up and let's try to minimize the conflicts between bpf and bpf-next
Thanks!
next prev parent reply other threads:[~2018-11-28 6:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 5:17 [PATCH bpf-next 0/3] bpf: btf: check name validity for various types Yonghong Song
2018-11-27 5:17 ` [PATCH bpf-next 1/3] " Yonghong Song
2018-11-27 19:02 ` Alexei Starovoitov [this message]
2018-11-27 19:57 ` Yonghong Song
2018-11-27 5:17 ` [PATCH bpf-next 2/3] tools/bpf: fix two test_btf unit test cases Yonghong Song
2018-11-27 5:17 ` [PATCH bpf-next 3/3] tools/bpf: add addition type tests to test_btf Yonghong Song
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=20181127190200.dszlrvtmdzkwbeqs@ast-mbp.dhcp.thefacebook.com \
--to=alexei.starovoitov@gmail.com \
--cc=ast@fb.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@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;
as well as URLs for NNTP newsgroup(s).