diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-16 20:12:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-16 20:12:29 +0200 |
| commit | 4a621e291000c3756c353c5671ade4837ba68e3e (patch) | |
| tree | c72611f4d343ec3d6dd232097ea1d3ad9e6b713e /kernel | |
| parent | Merge tag 'keys-trusted-next-6.11-rc4' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | rtla/osnoise: Prevent NULL dereference in error handling (diff) | |
| download | linux-4a621e291000c3756c353c5671ade4837ba68e3e.tar.xz linux-4a621e291000c3756c353c5671ade4837ba68e3e.zip | |
Merge tag 'trace-v6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing fixes from Steven Rostedt:
"A couple of fixes for tracing:
- Prevent a NULL pointer dereference in the error path of RTLA tool
- Fix an infinite loop bug when reading from the ring buffer when
closed. If there's a thread trying to read the ring buffer and it
gets closed by another thread, the one reading will go into an
infinite loop when the buffer is empty instead of exiting back to
user space"
* tag 'trace-v6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
rtla/osnoise: Prevent NULL dereference in error handling
tracing: Return from tracing_buffers_read() if the file has been closed
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 10cd38bce2f1..ebe7ce2f5f4a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7956,7 +7956,7 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, trace_access_unlock(iter->cpu_file); if (ret < 0) { - if (trace_empty(iter)) { + if (trace_empty(iter) && !iter->closed) { if ((filp->f_flags & O_NONBLOCK)) return -EAGAIN; |