From: Vincent Donnefort <vdonnefort@google.com>
To: rostedt@goodmis.org, mhiramat@kernel.org,
linux-trace-kernel@vger.kernel.org
Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com,
linux-kernel@vger.kernel.org,
syzbot+e0cc44465d6bae735679@syzkaller.appspotmail.com
Subject: Re: [PATCH] ring-buffer: Prevent subbuf order change when resizing is disabled
Date: Wed, 5 Aug 2026 17:36:51 +0100 [thread overview]
Message-ID: <anNmo6KLI697zYJP@google.com> (raw)
In-Reply-To: <20260805153225.2096152-1-vdonnefort@google.com>
On Wed, Aug 05, 2026 at 04:32:24PM +0100, Vincent Donnefort wrote:
> Because ring_buffer_subbuf_order_set() frees buffer pages, we can't
> allow it when risizing is disabled. A non-consuming reader is at risk of
> use-after-free (rb_advance_iter()).
>
> Return -EBUSY on resize_disabled, matching ring_buffer_resize()
> behaviour.
>
> Fixes: f9b94daa542a ("ring-buffer: Set new size of the ring buffer sub page")
> Reported-by: syzbot+e0cc44465d6bae735679@syzkaller.appspotmail.com
> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
>
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index 8e2485bb3aa8..414bca2121a7 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -7358,7 +7358,7 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order)
>
> cpu_buffer = buffer->buffers[cpu];
>
> - if (cpu_buffer->mapped) {
> + if (atomic_read(&cpu_buffer->resize_disabled)) {
Ha, my bad I forgot that mapped is not just "user-space mapped" but also
"range-mapped".
However probably the best is just to record_disable range mapped buffers in
rb_allocate_cpu_buffer()... especially ring_buffer_resize() doesn't use
cpu_buffer->mapped
> err = -EBUSY;
> goto error;
> }
>
> base-commit: 075b74841bd0065a3bda3440873c747938e69b68
> --
> 2.55.0.571.g244d577d93-goog
>
--
Vincent
next prev parent reply other threads:[~2026-08-05 16:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-05 15:32 [PATCH] ring-buffer: Prevent subbuf order change when resizing is disabled Vincent Donnefort
2026-08-05 16:36 ` Vincent Donnefort [this message]
2026-08-05 19:15 ` Vincent Donnefort
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=anNmo6KLI697zYJP@google.com \
--to=vdonnefort@google.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=syzbot+e0cc44465d6bae735679@syzkaller.appspotmail.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.