Steven Rostedt (VMware)
7e35f39f21
tracing: Do not reference char * as a string in histograms
commit 704adfb5a9978462cd861f170201ae2b5e3d3a80 upstream.
The histogram logic was allowing events with char * pointers to be used as
normal strings. But it was easy to crash the kernel with:
# echo 'hist:keys=filename' > events/syscalls/sys_enter_openat/trigger
And open some files, and boom!
BUG: unable to handle page fault for address: 00007f2ced0c3280
#PF: supervisor read access in kernel mode
#PF: error_code(0x0000) - not-present page
PGD 1173fa067 P4D 1173fa067 PUD 1171b6067 PMD 1171dd067 PTE 0
Oops: 0000 [#1] PREEMPT SMP
CPU: 6 PID: 1810 Comm: cat Not tainted 5.13.0-rc5-test+ #61
Hardware name: Hewlett-Packard HP Compaq Pro 6300 SFF/339A, BIOS K01
v03.03 07/14/2016
RIP: 0010:strlen+0x0/0x20
Code: f6 82 80 2a 0b a9 20 74 11 0f b6 50 01 48 83 c0 01 f6 82 80 2a 0b
a9 20 75 ef c3 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 <80> 3f 00 74
10 48 89 f8 48 83 c0 01 80 38 00 75 f7 48 29 f8 c3
RSP: 0018:ffffbdbf81567b50 EFLAGS: 00010246
RAX: 0000000000000003 RBX: ffff93815cdb3800 RCX: ffff9382401a22d0
RDX: 0000000000000100 RSI: 0000000000000000 RDI: 00007f2ced0c3280
RBP: 0000000000000100 R08: ffff9382409ff074 R09: ffffbdbf81567c98
R10: ffff9382409ff074 R11: 0000000000000000 R12: ffff9382409ff074
R13: 0000000000000001 R14: ffff93815a744f00 R15: 00007f2ced0c3280
FS: 00007f2ced0f8580(0000) GS:ffff93825a800000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f2ced0c3280 CR3: 0000000107069005 CR4: 00000000001706e0
Call Trace:
event_hist_trigger+0x463/0x5f0
? find_held_lock+0x32/0x90
? sched_clock_cpu+0xe/0xd0
? lock_release+0x155/0x440
? kernel_init_free_pages+0x6d/0x90
? preempt_count_sub+0x9b/0xd0
? kernel_init_free_pages+0x6d/0x90
? get_page_from_freelist+0x12c4/0x1680
? __rb_reserve_next+0xe5/0x460
? ring_buffer_lock_reserve+0x12a/0x3f0
event_triggers_call+0x52/0xe0
ftrace_syscall_enter+0x264/0x2c0
syscall_trace_enter.constprop.0+0x1ee/0x210
do_syscall_64+0x1c/0x80
entry_SYSCALL_64_after_hwframe+0x44/0xae
Where it triggered a fault on strlen(key) where key was the filename.
The reason is that filename is a char * to user space, and the histogram
code just blindly dereferenced it, with obvious bad results.
I originally tried to use strncpy_from_user/kernel_nofault() but found
that there's other places that its dereferenced and not worth the effort.
Just do not allow "char *" to act like strings.
Link: https://lkml.kernel.org/r/20210715000206.025df9d2@rorschach.local.home
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
Cc: stable@vger.kernel.org
Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Tom Zanussi <zanussi@kernel.org>
Fixes: 79e577cbce ("tracing: Support string type key properly")
Fixes: 5967bd5c4239 ("tracing: Let filter_assign_type() detect FILTER_PTR_STRING")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-07-20 16:17:48 +02:00
..
2021-06-10 12:43:53 +02:00
2021-06-16 11:53:02 +02:00
2017-08-22 18:43:23 -07:00
2021-03-03 18:22:36 +01:00
2021-06-16 11:53:04 +02:00
2020-09-23 10:46:32 +02:00
2021-03-24 11:05:06 +01:00
2019-10-07 18:55:09 +02:00
2021-01-30 13:31:16 +01:00
2020-10-29 09:07:16 +01:00
2021-03-03 18:22:55 +01:00
2019-05-31 06:47:33 -07:00
2021-06-10 12:43:53 +02:00
2021-05-22 10:57:22 +02:00
2021-07-20 16:17:48 +02:00
2018-01-10 09:31:17 +01:00
2018-02-16 20:23:05 +01:00
2017-11-02 11:10:55 +01:00
2020-10-01 13:12:33 +02:00
2020-06-20 10:25:10 +02:00
2020-06-20 10:25:10 +02:00
2020-06-20 10:25:10 +02:00
2019-12-01 09:14:03 +01:00
2018-11-13 11:15:08 -08:00
2017-11-02 11:10:55 +01:00
2020-06-20 10:24:58 +02:00
2020-06-20 10:25:19 +02:00
2021-07-20 16:17:46 +02:00
2018-01-17 09:45:27 +01:00
2020-01-09 10:17:54 +01:00
2018-08-03 07:50:38 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2020-11-18 18:27:58 +01:00
2017-09-23 16:50:20 -04:00
2020-11-10 10:29:06 +01:00
2021-07-11 12:48:12 +02:00
2017-12-20 10:10:18 +01:00
2019-04-20 09:15:05 +02:00
2018-12-05 19:41:17 +01:00
2019-09-21 07:15:38 +02:00
2017-11-02 11:10:55 +01:00
2018-08-03 07:50:22 +02:00
2019-11-24 08:23:15 +01:00
2021-05-22 10:57:39 +02:00
2017-11-02 11:10:55 +01:00
2017-07-12 16:26:00 -07:00
2020-04-24 08:00:44 +02:00
2021-02-10 09:12:09 +01:00
2017-07-12 16:25:59 -07:00
2021-07-11 12:48:13 +02:00
2021-02-10 09:12:08 +01:00
2019-01-13 10:01:02 +01:00
2021-05-22 10:57:24 +02:00
2020-04-02 16:34:20 +02:00
2020-05-27 16:43:05 +02:00
2019-10-17 13:43:19 -07:00
2017-10-03 17:54:26 -07:00
2019-07-31 07:28:21 +02:00
2017-08-21 12:47:31 -07:00
2021-05-26 11:46:58 +02:00
2017-11-02 11:10:55 +01:00
2020-11-18 18:28:02 +01:00
2020-08-26 10:29:54 +02:00
2018-04-24 09:36:22 +02:00
2021-03-03 18:22:53 +01:00
2020-04-24 08:00:38 +02:00
2021-05-22 10:57:35 +02:00
2021-02-07 14:47:41 +01:00
2017-11-02 11:10:55 +01:00
2018-08-15 18:12:47 +02:00
2018-09-05 09:26:36 +02:00
2017-11-02 11:10:55 +01:00
2020-10-01 13:12:30 +02:00
2017-11-02 11:10:55 +01:00
2020-01-04 13:59:57 +01:00
2017-12-25 14:26:21 +01:00
2020-01-09 10:17:53 +01:00
2017-07-25 13:04:45 -07:00
2021-03-03 18:22:47 +01:00
2017-12-20 10:10:18 +01:00
2020-10-14 09:51:10 +02:00
2021-05-22 10:57:35 +02:00
2018-09-09 19:56:00 +02:00
2018-09-09 19:56:00 +02:00
2018-09-05 09:26:42 +02:00
2020-02-28 16:36:05 +01:00
2017-11-06 12:26:49 -08:00
2021-06-16 11:53:01 +02:00