tracing: fix oob write in trace_seq_to_buffer()
PATCH v2 1/1 tracing: fix oob write in trace_seq_to_buffer()
syzbot reported this bug:
==================================================================
BUG: KASAN: slab-out-of-bounds in trace_seq_to_buffer kernel/trace/trace.c:1830 [inline] BUG: KASAN: slab-out-of-bounds in tracing_splice_read_pipe+0x6be/0xdd0 kernel/trace/trace.c:6822 Write of size 4507 at addr ffff888032b6b000 by task syz.2.320/7260 CPU: 1 UID: 0 PID: 7260 Comm: syz.2.320 Not tainted 6.15.0-rc1-syzkaller-00301-g3bde70a2c827 #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:408 [inline] print_report+0xc3/0x670 mm/kasan/report.c:521 kasan_report+0xe0/0x110 mm/kasan/report.c:634 check_region_inline mm/kasan/generic.c:183 [inline] kasan_check_range+0xef/0x1a0 mm/kasan/generic.c:189 __asan_memcpy+0x3c/0x60 mm/kasan/shadow.c:106 trace_seq_to_buffer kernel/trace/trace.c:1830 [inline] tracing_splice_read_pipe+0x6be/0xdd0 kernel/trace/trace.c:6822 .... ==================================================================
It has been reported that trace_seq_to_buffer() tries to copy more data than PAGE_SIZE to buf. Therefore, to prevent this, we should use the smaller of trace_seq_used(&iter->seq) and PAGE_SIZE as an argument.
---
v2: Corrected the correct location as suggested by the maintainer
--- kernel/trace/trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
kernel/trace/trace.c +5 -3
@@ -6784,7 +6784,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, };ssize_t ret;size_t rem; -unsigned int i; +unsigned int i, copy_len;if (splice_grow_spd (pipe, &spd))return -ENOMEM ;
@@ -6818,16 +6818,18 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, rem =tracing_fill_pipe_page (rem, iter); + copy_len =trace_seq_used (&iter->seq); +/* Copy the data into the page, so we can start over. */ ret =trace_seq_to_buffer (&iter->seq,page_address (spd.pages[i]), -trace_seq_used (&iter->seq)); +min (copy_len,PAGE_SIZE ));if (ret <0 ) {__free_page (spd.pages[i]);break ; } spd.partial[i].offset =0 ; - spd.partial[i].len =trace_seq_used (&iter->seq); + spd.partial[i].len =min (copy_len,PAGE_SIZE );trace_seq_init (&iter->seq); }
--
Steven Rostedt
maintainerkernel/trace/trace.c static ssize_t tracing_splice_read_pipe(struct file *filp, · line 6787
Quoted 8 lines · On Tue, 22 Apr 2025 00:28:50 +0900 Jeongjun Park <[email protected]> wrote:
kernel/trace/trace.c +1
-1@@ -6784,7 +6784,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, };ssize_t ret;size_t rem; -unsigned int i; +unsigned int i, copy_len;
FYI, I don't care for variables to be on the same line unless they are related. As "i" and "copy_len" are not related, the should be separate declarations.
unsigned int copy_len; unsigned int i;
kernel/trace/trace.c static ssize_t tracing_splice_read_pipe(struct file *filp, · line 6821
Quoted 8 lines
kernel/trace/trace.c +1
-0if (splice_grow_spd (pipe, &spd))return -ENOMEM ;@@ -6818,16 +6818,18 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, rem =tracing_fill_pipe_page (rem, iter); + copy_len =trace_seq_used (&iter->seq);
Why not have the min here?
copy_len = min(trace_seq_used(&iter->seq), PAGE_SIZE);
??
kernel/trace/trace.c static ssize_t tracing_splice_read_pipe(struct file *filp, · line 6832
Quoted 13 lines
kernel/trace/trace.c +3
-2+/* Copy the data into the page, so we can start over. */ ret =trace_seq_to_buffer (&iter->seq,page_address (spd.pages[i]), -trace_seq_used (&iter->seq)); +min (copy_len,PAGE_SIZE ));if (ret <0 ) {__free_page (spd.pages[i]);break ; } spd.partial[i].offset =0 ; - spd.partial[i].len =trace_seq_used (&iter->seq); + spd.partial[i].len =min (copy_len,PAGE_SIZE );
And actually, len should equal ret as that's how much was copied.
-- Steve
Quoted 4 lines
kernel/trace/trace.c +0
-1trace_seq_init (&iter->seq); } --