From: Jiayuan Chen <jiayuan.chen@linux.dev>
To: bpf@vger.kernel.org
Cc: Jiayuan Chen <jiayuan.chen@linux.dev>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
Jiri Olsa <jolsa@kernel.org>,
Emil Tsalapatis <emil@etsalapatis.com>,
Ihor Solodrai <ihor.solodrai@linux.dev>,
Shuah Khan <shuah@kernel.org>,
Mykyta Yatsenko <yatsenko@meta.com>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: [PATCH bpf 2/2] selftests/bpf: Add test for key-less BTF hash map
Date: Fri, 28 Aug 2026 17:31:17 +0800 [thread overview]
Message-ID: <20260828093142.179856-2-jiayuan.chen@linux.dev> (raw)
In-Reply-To: <20260828093142.179856-1-jiayuan.chen@linux.dev>
Create a hash and an rhash map with btf_key_type_id == 0 and expect
bpf_map_create() to fail with -EINVAL. On an unfixed kernel the map is
created; the test then pins and reads it back to walk the bpffs dump path,
which reproduces the btf_type_show() NULL-deref - so running this test on
an unfixed kernel panics it.
Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
---
.../bpf/prog_tests/btf_map_keyless.c | 69 +++++++++++++++++++
1 file changed, 69 insertions(+)
create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_map_keyless.c
diff --git a/tools/testing/selftests/bpf/prog_tests/btf_map_keyless.c b/tools/testing/selftests/bpf/prog_tests/btf_map_keyless.c
new file mode 100644
index 000000000000..6e1496cbd8bf
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/btf_map_keyless.c
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+#define _GNU_SOURCE
+#include <test_progs.h>
+#include <bpf/btf.h>
+
+/*
+ * A key-less BTF (btf_key_type_id == 0) is only meant for array maps. A hash
+ * map with one used to NULL-deref in btf_type_show() when dumped via bpffs.
+ * A fixed kernel rejects such a map at creation; on an unfixed kernel the
+ * pin-and-read below deliberately walks that bpffs dump path, so running this
+ * test on an unfixed kernel panics it.
+ */
+static void check_keyless(int map_type, __u32 map_flags, int btf_fd, int val_id)
+{
+ const char *path = "/sys/fs/bpf/keyless_map";
+ LIBBPF_OPTS(bpf_map_create_opts, opts);
+ __u32 key = 1, val = 0x41424344;
+ char buf[256];
+ int map_fd;
+ FILE *f;
+
+ opts.map_flags = map_flags;
+ opts.btf_fd = btf_fd;
+ opts.btf_key_type_id = 0;
+ opts.btf_value_type_id = val_id;
+ map_fd = bpf_map_create(map_type, "keyless_map", 4, 4, 8, &opts);
+
+ if (map_fd >= 0) {
+ /* Unfixed kernel: reproduce the oops via the bpffs dump path. */
+ (void)bpf_map_update_elem(map_fd, &key, &val, 0);
+ if (bpf_obj_pin(map_fd, path) == 0) {
+ f = fopen(path, "r");
+ if (f) {
+ while (fgets(buf, sizeof(buf), f))
+ ;
+ fclose(f);
+ }
+ unlink(path);
+ }
+ close(map_fd);
+ }
+
+ ASSERT_EQ(map_fd, -EINVAL, "key-less create is rejected");
+}
+
+void test_btf_map_keyless(void)
+{
+ int btf_fd, val_id;
+ struct btf *btf;
+
+ btf = btf__new_empty();
+ if (!ASSERT_OK_PTR(btf, "btf__new_empty"))
+ return;
+
+ val_id = btf__add_int(btf, "int", 4, BTF_INT_SIGNED);
+ if (!ASSERT_GT(val_id, 0, "btf__add_int"))
+ goto out;
+
+ if (!ASSERT_OK(btf__load_into_kernel(btf), "btf__load_into_kernel"))
+ goto out;
+ btf_fd = btf__fd(btf);
+
+ if (test__start_subtest("hash"))
+ check_keyless(BPF_MAP_TYPE_HASH, 0, btf_fd, val_id);
+ if (test__start_subtest("rhash"))
+ check_keyless(BPF_MAP_TYPE_RHASH, BPF_F_NO_PREALLOC, btf_fd, val_id);
+out:
+ btf__free(btf);
+}
--
2.43.0
next prev parent reply other threads:[~2026-08-28 9:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-28 9:31 [PATCH bpf 1/2] bpf: Fix NULL-ptr-deref when dumping a key-less BTF hash map Jiayuan Chen
2026-08-28 9:31 ` Jiayuan Chen [this message]
2026-08-28 10:17 ` [PATCH bpf 2/2] selftests/bpf: Add test for " bot+bpf-ci
2026-08-28 9:54 ` [PATCH bpf 1/2] bpf: Fix NULL-ptr-deref when dumping a " sashiko-bot
2026-08-28 10:51 ` Jiayuan Chen
2026-08-28 22:28 ` 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=20260828093142.179856-2-jiayuan.chen@linux.dev \
--to=jiayuan.chen@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=ihor.solodrai@linux.dev \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yatsenko@meta.com \
--cc=yonghong.song@linux.dev \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.