BPF List
 help / color / mirror / Atom feed
From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
	<daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>,
	Christopher William Snowhill <chris@kode54.net>
Subject: [PATCH bpf 1/2] bpf: allow empty module BTFs
Date: Sat, 9 Jan 2021 23:03:40 -0800	[thread overview]
Message-ID: <20210110070341.1380086-1-andrii@kernel.org> (raw)

Some modules don't declare any new types and end up with an empty BTF,
containing only valid BTF header and no types or strings sections. This
currently causes BTF validation error. There is nothing wrong with such BTF,
so fix the issue by allowing module BTFs with no types or strings.

Reported-by: Christopher William Snowhill <chris@kode54.net>
Fixes: 36e68442d1af ("bpf: Load and verify kernel module BTFs")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 kernel/bpf/btf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 8d6bdb4f4d61..84a36ee4a4c2 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -4172,7 +4172,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
 		return -ENOTSUPP;
 	}
 
-	if (btf_data_size == hdr->hdr_len) {
+	if (!btf->base_btf && btf_data_size == hdr->hdr_len) {
 		btf_verifier_log(env, "No data");
 		return -EINVAL;
 	}
-- 
2.24.1


             reply	other threads:[~2021-01-10  7:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-10  7:03 Andrii Nakryiko [this message]
2021-01-10  7:03 ` [PATCH bpf 2/2] libbpf: allow loading empty BTFs Andrii Nakryiko
2021-01-11 18:13   ` Yonghong Song
2021-01-11 20:51     ` Andrii Nakryiko
2021-01-12  1:15       ` Yonghong Song
2021-01-12  6:41         ` Andrii Nakryiko
2021-01-12 20:17           ` Daniel Borkmann
2021-01-12 20:26             ` Andrii Nakryiko
2021-01-11 18:08 ` [PATCH bpf 1/2] bpf: allow empty module BTFs Yonghong Song
2021-01-12 20:20 ` patchwork-bot+netdevbpf
2021-01-24 10:27   ` Christopher William Snowhill
2021-01-26  1:26     ` Andrii Nakryiko
2021-01-26  2:17       ` Christopher William Snowhill

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=20210110070341.1380086-1-andrii@kernel.org \
    --to=andrii@kernel.org \
    --cc=ast@fb.com \
    --cc=bpf@vger.kernel.org \
    --cc=chris@kode54.net \
    --cc=daniel@iogearbox.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