mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
To: Vincent Donnefort <vdonnefort@google.com>
Cc: rostedt@goodmis.org, linux-trace-kernel@vger.kernel.org,
	mathieu.desnoyers@efficios.com, kernel-team@android.com,
	linux-kernel@vger.kernel.org, Kyuwon Cho <kyuwoncho18@gmail.com>
Subject: Re: [PATCH] tracing: Take trace_access_lock() in tracing_buffers_ioctl()
Date: Tue, 17 Nov 2026 20:31:01 +0900	[thread overview]
Message-ID: <undine-1794915061850927775-e5dfd8cf943f5fce@undined.local> (raw)
In-Reply-To: <20261117082932.3441173-1-vdonnefort@google.com>

On Tue, 17 Nov 2026 08:29:32 +0000, Vincent Donnefort <vdonnefort@google.com> wrote:
> tracing_buffers_ioctl() calls ring_buffer_map_get_reader() without
> trace_access_lock, breaking concurrent readers. Take trace_access_lock()
> around ring_buffer_map_get_reader(), matching the other consuming
> readers.
> 
> Fixes: cf9f0f7c4c5b ("tracing: Allow user-space mapping of the ring-buffer")
> Reported-by: Kyuwon Cho <kyuwoncho18@gmail.com>
> Closes: https://lore.kernel.org/all/179485165154.2547186.6129837870360499372@gmail.com/
> Cc: stable@vger.kernel.org
> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>

Looks good to me.

Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks!

> ---
>  kernel/trace/trace.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index e8c4efa8107b..456fc388a31f 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -7404,8 +7404,12 @@ static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned
>  				return err;
>  		}
>  
> -		return ring_buffer_map_get_reader(iter->array_buffer->buffer,
> -						  iter->cpu_file);
> +		trace_access_lock(iter->cpu_file);
> +		err = ring_buffer_map_get_reader(iter->array_buffer->buffer,
> +						 iter->cpu_file);
> +		trace_access_unlock(iter->cpu_file);
> +
> +		return err;
>  	} else if (cmd) {
>  		return -ENOTTY;
>  	}
> 
> base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
> -- 
> 2.56.1.703.gf848ed807c-goog
> 
>

-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

      reply	other threads:[~2026-11-17 11:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17  8:29 Vincent Donnefort
2026-11-17 11:31 ` Masami Hiramatsu (Google) [this message]

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=undine-1794915061850927775-e5dfd8cf943f5fce@undined.local \
    --to=mhiramat@kernel.org \
    --cc=kernel-team@android.com \
    --cc=kyuwoncho18@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=rostedt@goodmis.org \
    --cc=vdonnefort@google.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

all inboxes | Powered by JetHome®