mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] tracing: Take trace_access_lock() in tracing_buffers_ioctl()
@ 2026-11-17  8:29 Vincent Donnefort
  2026-11-17 11:31 ` Masami Hiramatsu (Google)
  0 siblings, 1 reply; 2+ messages in thread
From: Vincent Donnefort @ 2026-11-17  8:29 UTC (permalink / raw)
  To: rostedt, mhiramat, linux-trace-kernel
  Cc: mathieu.desnoyers, kernel-team, linux-kernel, Vincent Donnefort,
	Kyuwon Cho, stable

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>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] tracing: Take trace_access_lock() in tracing_buffers_ioctl()
  2026-11-17  8:29 [PATCH] tracing: Take trace_access_lock() in tracing_buffers_ioctl() Vincent Donnefort
@ 2026-11-17 11:31 ` Masami Hiramatsu (Google)
  0 siblings, 0 replies; 2+ messages in thread
From: Masami Hiramatsu (Google) @ 2026-11-17 11:31 UTC (permalink / raw)
  To: Vincent Donnefort
  Cc: rostedt, linux-trace-kernel, mathieu.desnoyers, kernel-team,
	linux-kernel, Kyuwon Cho

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>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-17 11:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17  8:29 [PATCH] tracing: Take trace_access_lock() in tracing_buffers_ioctl() Vincent Donnefort
2026-11-17 11:31 ` Masami Hiramatsu (Google)

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®