Skip to content

Commit c777d95

Browse files
vitkyrkaHashcode
authored andcommitted
tracing/syscalls: Ignore numbers outside NR_syscalls' range
ARM has some private syscalls (for example, set_tls(2)) which lie outside the range of NR_syscalls. If any of these are called while syscall tracing is being performed, out-of-bounds array access will occur in the ftrace and perf sys_{enter,exit} handlers. # trace-cmd record -e raw_syscalls:* true && trace-cmd report ... true-653 [000] 384.675777: sys_enter: NR 192 (0, 1000, 3, 4000022, ffffffff, 0) true-653 [000] 384.675812: sys_exit: NR 192 = 1995915264 true-653 [000] 384.675971: sys_enter: NR 983045 (76f74480, 76f74000, 76f74b28, 76f74480, 76f76f74, 1) true-653 [000] 384.675988: sys_exit: NR 983045 = 0 ... # trace-cmd record -e syscalls:* true [ 17.289329] Unable to handle kernel paging request at virtual address aaaaaace [ 17.289590] pgd = 9e71c000 [ 17.289696] [aaaaaace] *pgd=00000000 [ 17.289985] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 17.290169] Modules linked in: [ 17.290391] CPU: 0 PID: 704 Comm: true Not tainted 3.18.0-rc2+ #21 [ 17.290585] task: 9f4dab00 ti: 9e710000 task.ti: 9e710000 [ 17.290747] PC is at ftrace_syscall_enter+0x48/0x1f8 [ 17.290866] LR is at syscall_trace_enter+0x124/0x184 Fix this by ignoring out-of-NR_syscalls-bounds syscall numbers. Commit cd0980f "tracing: Check invalid syscall nr while tracing syscalls" added the check for less than zero, but it should have also checked for greater than NR_syscalls. Link: http://lkml.kernel.org/p/1414620418-29472-1-git-send-email-rabin@rab.in Fixes: cd0980f "tracing: Check invalid syscall nr while tracing syscalls" Cc: stable@vger.kernel.org # 2.6.33+ Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Conflicts: kernel/trace/trace_syscalls.c Change-Id: I512142f8f1e1b2a8dc063209666dbce9737377e7
1 parent 0f33e50 commit c777d95

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kernel/trace/trace_syscalls.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)
307307
int syscall_nr;
308308

309309
syscall_nr = syscall_get_nr(current, regs);
310-
if (syscall_nr < 0)
310+
if (syscall_nr < 0 || syscall_nr >= NR_syscalls)
311311
return;
312312
if (!test_bit(syscall_nr, enabled_enter_syscalls))
313313
return;
@@ -341,7 +341,7 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
341341
int syscall_nr;
342342

343343
syscall_nr = syscall_get_nr(current, regs);
344-
if (syscall_nr < 0)
344+
if (syscall_nr < 0 || syscall_nr >= NR_syscalls)
345345
return;
346346
if (!test_bit(syscall_nr, enabled_exit_syscalls))
347347
return;
@@ -506,7 +506,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
506506
int size;
507507

508508
syscall_nr = syscall_get_nr(current, regs);
509-
if (syscall_nr < 0)
509+
if (syscall_nr < 0 || syscall_nr >= NR_syscalls)
510510
return;
511511
if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
512512
return;
@@ -582,7 +582,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
582582
int size;
583583

584584
syscall_nr = syscall_get_nr(current, regs);
585-
if (syscall_nr < 0)
585+
if (syscall_nr < 0 || syscall_nr >= NR_syscalls)
586586
return;
587587
if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
588588
return;

0 commit comments

Comments
 (0)