From: Ihor Solodrai <ihor.solodrai@linux.dev>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>
Cc: Amery Hung <ameryhung@gmail.com>,
Emil Tsalapatis <emil@etsalapatis.com>,
Nicholas Carlini <npc@anthropic.com>,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@meta.com
Subject: [PATCH bpf-next v1 4/6] selftests/bpf: Cover the user ringbuf callback dynptr lifetime
Date: Mon, 21 Sep 2026 18:03:31 -0700 [thread overview]
Message-ID: <20260922010333.1226537-5-ihor.solodrai@linux.dev> (raw)
In-Reply-To: <20260922010333.1226537-1-ihor.solodrai@linux.dev>
Add a rejection test for each route the bpf_user_ringbuf_drain() callback
dynptr can take out of its frame:
- the CONST_PTR_TO_DYNPTR register parked in callback_ctx
- a bpf_dynptr_data() slice
- a bpf_dynptr_slice() slice
- a bpf_dynptr_clone() written into the caller's frame
- a slice taken from that clone after the drain returns
- an inner drain's dynptr escaping into an outer callback
The first also checks that the diagnostic names the callback.
bpf_throw() from the callback reaches check_reference_leak() with the
frame reference still live, and is rejected afterwards by
check_max_stack_depth(). It matches that rejection in full, because
"bpf_throw" alone also matches the reference-leak wording the callback
must not produce.
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
.../selftests/bpf/progs/exceptions_fail.c | 20 +++
.../selftests/bpf/progs/user_ringbuf_fail.c | 143 ++++++++++++++++++
2 files changed, 163 insertions(+)
diff --git a/tools/testing/selftests/bpf/progs/exceptions_fail.c b/tools/testing/selftests/bpf/progs/exceptions_fail.c
index 22503cf62e9f..86a0667ba348 100644
--- a/tools/testing/selftests/bpf/progs/exceptions_fail.c
+++ b/tools/testing/selftests/bpf/progs/exceptions_fail.c
@@ -31,6 +31,11 @@ struct {
__type(value, struct hmap_elem);
} hmap SEC(".maps");
+struct {
+ __uint(type, BPF_MAP_TYPE_USER_RINGBUF);
+ __uint(max_entries, 4096);
+} user_ringbuf SEC(".maps");
+
private(A) struct bpf_spin_lock lock;
private(A) struct bpf_rb_root rbtree __contains(foo, node);
@@ -110,6 +115,21 @@ static int timer_cb(void *map, int *key, struct bpf_timer *timer)
return 0;
}
+static long drain_cb(struct bpf_dynptr *dynptr, void *context)
+{
+ bpf_throw(0);
+ return 0;
+}
+
+SEC("?tc")
+__failure
+__msg("bpf_throw kfunc (insn {{[0-9]+}}) cannot be called from callback subprog {{[0-9]+}}")
+int reject_user_ringbuf_callback_throw(struct __sk_buff *ctx)
+{
+ bpf_user_ringbuf_drain(&user_ringbuf, drain_cb, NULL, 0);
+ return 0;
+}
+
SEC("?tc")
__failure __msg("cannot be called from callback subprog")
int reject_async_callback_throw(struct __sk_buff *ctx)
diff --git a/tools/testing/selftests/bpf/progs/user_ringbuf_fail.c b/tools/testing/selftests/bpf/progs/user_ringbuf_fail.c
index c0d0422b8030..a8d3acfa2bd2 100644
--- a/tools/testing/selftests/bpf/progs/user_ringbuf_fail.c
+++ b/tools/testing/selftests/bpf/progs/user_ringbuf_fail.c
@@ -1,9 +1,11 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+#include <stdbool.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"
+#include "bpf_kfuncs.h"
char _license[] SEC("license") = "GPL";
@@ -243,3 +245,144 @@ int user_ringbuf_callback_const_ptr_to_dynptr_reg_off(void *ctx)
callback_adjust_bpf_dynptr_reg_off, NULL, 0);
return 0;
}
+
+/* The sample goes back to the producer as soon as the callback returns. */
+struct dynptr_ctx {
+ struct bpf_dynptr *saved;
+};
+
+static long callback_park_dynptr(struct bpf_dynptr *dynptr, void *context)
+{
+ struct dynptr_ctx *c = context;
+
+ c->saved = dynptr;
+ return 0;
+}
+
+SEC("?raw_tp")
+__failure __msg("the callback that owned this value returned")
+int user_ringbuf_callback_park_dynptr(void *ctx)
+{
+ struct dynptr_ctx c = {};
+ char buf[8] = {};
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_dynptr, &c, 0);
+ if (c.saved)
+ bpf_dynptr_read(buf, sizeof(buf), c.saved, 0, 0);
+ return buf[0];
+}
+
+struct slice_ctx {
+ char *p;
+};
+
+static long callback_park_data_slice(struct bpf_dynptr *dynptr, void *context)
+{
+ struct slice_ctx *c = context;
+
+ c->p = bpf_dynptr_data(dynptr, 0, 8);
+ return 0;
+}
+
+SEC("?raw_tp")
+__failure __msg("the callback that owned this value returned")
+int user_ringbuf_callback_park_data_slice(void *ctx)
+{
+ struct slice_ctx c = {};
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_data_slice, &c, 0);
+ if (c.p)
+ return c.p[0];
+ return 0;
+}
+
+static long callback_park_kfunc_slice(struct bpf_dynptr *dynptr, void *context)
+{
+ struct slice_ctx *c = context;
+
+ c->p = bpf_dynptr_slice(dynptr, 0, NULL, 8);
+ return 0;
+}
+
+SEC("?raw_tp")
+__failure __msg("the callback that owned this value returned")
+int user_ringbuf_callback_park_kfunc_slice(void *ctx)
+{
+ struct slice_ctx c = {};
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_kfunc_slice, &c, 0);
+ if (c.p)
+ return c.p[0];
+ return 0;
+}
+
+struct clone_ctx {
+ struct bpf_dynptr clone;
+ __u64 armed;
+};
+
+static long callback_park_clone(struct bpf_dynptr *dynptr, void *context)
+{
+ struct clone_ctx *c = context;
+
+ bpf_dynptr_clone(dynptr, &c->clone);
+ c->armed = 1;
+ return 0;
+}
+
+SEC("?raw_tp")
+__failure __msg("Expected an initialized dynptr as R3")
+int user_ringbuf_callback_park_clone(void *ctx)
+{
+ struct clone_ctx c = {};
+ char buf[8] = {};
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_clone, &c, 0);
+ if (c.armed)
+ bpf_dynptr_read(buf, sizeof(buf), &c.clone, 0, 0);
+ return buf[0];
+}
+
+SEC("?raw_tp")
+__failure __msg("Expected an initialized dynptr as R1")
+int user_ringbuf_callback_park_clone_then_slice(void *ctx)
+{
+ struct clone_ctx c = {};
+ char *p;
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_clone, &c, 0);
+ if (c.armed) {
+ p = bpf_dynptr_data(&c.clone, 0, 8);
+ if (p)
+ return p[0];
+ }
+ return 0;
+}
+
+static long callback_park_inner(struct bpf_dynptr *dynptr, void *context)
+{
+ struct dynptr_ctx *c = context;
+
+ c->saved = dynptr;
+ return 0;
+}
+
+/* An inner drain's dynptr must not escape into the outer callback either. */
+static long callback_park_outer(struct bpf_dynptr *dynptr, void *context)
+{
+ struct dynptr_ctx inner = {};
+ char buf[8] = {};
+
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_inner, &inner, 0);
+ if (inner.saved)
+ bpf_dynptr_read(buf, sizeof(buf), inner.saved, 0, 0);
+ return buf[0] ? 1 : 0;
+}
+
+SEC("?raw_tp")
+__failure __msg("the callback that owned this value returned")
+int user_ringbuf_callback_nested_park_inner(void *ctx)
+{
+ bpf_user_ringbuf_drain(&user_ringbuf, callback_park_outer, NULL, 0);
+ return 0;
+}
--
2.55.0
next prev parent reply other threads:[~2026-09-22 1:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 1:03 [PATCH bpf-next v1 0/6] bpf: Scope callback arguments to their frame Ihor Solodrai
2026-09-22 1:03 ` [PATCH bpf-next v1 1/6] bpf: Introduce REF_TYPE_FRAME in the verifier Ihor Solodrai
2026-09-22 2:01 ` bot+bpf-ci
2026-09-22 1:03 ` [PATCH bpf-next v1 2/6] bpf: Scope the bpf_user_ringbuf_drain() dynptr to its callback frame Ihor Solodrai
2026-09-22 1:47 ` bot+bpf-ci
2026-09-22 1:03 ` [PATCH bpf-next v1 3/6] bpf: Name the callback in frame-release diagnostics Ihor Solodrai
2026-09-22 1:03 ` Ihor Solodrai [this message]
2026-09-22 1:47 ` [PATCH bpf-next v1 4/6] selftests/bpf: Cover the user ringbuf callback dynptr lifetime bot+bpf-ci
2026-09-22 1:03 ` [PATCH bpf-next v1 5/6] bpf: Scope the bpf_for_each_map_elem() array key to the callback frame Ihor Solodrai
2026-09-22 1:03 ` [PATCH bpf-next v1 6/6] selftests/bpf: Cover callback-frame map key lifetime Ihor Solodrai
2026-09-22 1:47 ` bot+bpf-ci
2026-09-22 1:55 ` [PATCH bpf-next v1 0/6] bpf: Scope callback arguments to their frame Alexei Starovoitov
2026-09-22 2:15 ` Kumar Kartikeya Dwivedi
2026-09-22 6:13 ` Ihor Solodrai
2026-09-22 22:41 ` Andrii Nakryiko
2026-09-24 7:02 ` Eduard Zingerman
2026-09-24 7:18 ` 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=20260922010333.1226537-5-ihor.solodrai@linux.dev \
--to=ihor.solodrai@linux.dev \
--cc=ameryhung@gmail.com \
--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=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=memxor@gmail.com \
--cc=npc@anthropic.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 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.