Skip to content

Commit 0fa388a

Browse files
chenyuan0001gregkh
authored andcommitted
tracing: Fix race condition in kprobe initialization causing NULL pointer dereference
[ Upstream commit 9cf9aa7 ] There is a critical race condition in kprobe initialization that can lead to NULL pointer dereference and kernel crash. [1135630.084782] Unable to handle kernel paging request at virtual address 0000710a04630000 ... [1135630.260314] pstate: 404003c9 (nZcv DAIF +PAN -UAO) [1135630.269239] pc : kprobe_perf_func+0x30/0x260 [1135630.277643] lr : kprobe_dispatcher+0x44/0x60 [1135630.286041] sp : ffffaeff4977fa40 [1135630.293441] x29: ffffaeff4977fa40 x28: ffffaf015340e400 [1135630.302837] x27: 0000000000000000 x26: 0000000000000000 [1135630.312257] x25: ffffaf029ed108a8 x24: ffffaf015340e528 [1135630.321705] x23: ffffaeff4977fc50 x22: ffffaeff4977fc50 [1135630.331154] x21: 0000000000000000 x20: ffffaeff4977fc50 [1135630.340586] x19: ffffaf015340e400 x18: 0000000000000000 [1135630.349985] x17: 0000000000000000 x16: 0000000000000000 [1135630.359285] x15: 0000000000000000 x14: 0000000000000000 [1135630.368445] x13: 0000000000000000 x12: 0000000000000000 [1135630.377473] x11: 0000000000000000 x10: 0000000000000000 [1135630.386411] x9 : 0000000000000000 x8 : 0000000000000000 [1135630.395252] x7 : 0000000000000000 x6 : 0000000000000000 [1135630.403963] x5 : 0000000000000000 x4 : 0000000000000000 [1135630.412545] x3 : 0000710a04630000 x2 : 0000000000000006 [1135630.421021] x1 : ffffaeff4977fc50 x0 : 0000710a04630000 [1135630.429410] Call trace: [1135630.434828] kprobe_perf_func+0x30/0x260 [1135630.441661] kprobe_dispatcher+0x44/0x60 [1135630.448396] aggr_pre_handler+0x70/0xc8 [1135630.454959] kprobe_breakpoint_handler+0x140/0x1e0 [1135630.462435] brk_handler+0xbc/0xd8 [1135630.468437] do_debug_exception+0x84/0x138 [1135630.475074] el1_dbg+0x18/0x8c [1135630.480582] security_file_permission+0x0/0xd0 [1135630.487426] vfs_write+0x70/0x1c0 [1135630.493059] ksys_write+0x5c/0xc8 [1135630.498638] __arm64_sys_write+0x24/0x30 [1135630.504821] el0_svc_common+0x78/0x130 [1135630.510838] el0_svc_handler+0x38/0x78 [1135630.516834] el0_svc+0x8/0x1b0 kernel/trace/trace_kprobe.c: 1308 0xffff3df8995039ec <kprobe_perf_func+0x2c>: ldr x21, [x24,#120] include/linux/compiler.h: 294 0xffff3df8995039f0 <kprobe_perf_func+0x30>: ldr x1, [x21,x0] kernel/trace/trace_kprobe.c 1308: head = this_cpu_ptr(call->perf_events); 1309: if (hlist_empty(head)) 1310: return 0; crash> struct trace_event_call -o struct trace_event_call { ... [120] struct hlist_head *perf_events; //(call->perf_event) ... } crash> struct trace_event_call ffffaf015340e528 struct trace_event_call { ... perf_events = 0xffff0ad5fa89f088, //this value is correct, but x21 = 0 ... } Race Condition Analysis: The race occurs between kprobe activation and perf_events initialization: CPU0 CPU1 ==== ==== perf_kprobe_init perf_trace_event_init tp_event->perf_events = list;(1) tp_event->class->reg (2)← KPROBE ACTIVE Debug exception triggers ... kprobe_dispatcher kprobe_perf_func (tk->tp.flags & TP_FLAG_PROFILE) head = this_cpu_ptr(call->perf_events)(3) (perf_events is still NULL) Problem: 1. CPU0 executes (1) assigning tp_event->perf_events = list 2. CPU0 executes (2) enabling kprobe functionality via class->reg() 3. CPU1 triggers and reaches kprobe_dispatcher 4. CPU1 checks TP_FLAG_PROFILE - condition passes (step 2 completed) 5. CPU1 calls kprobe_perf_func() and crashes at (3) because call->perf_events is still NULL CPU1 sees that kprobe functionality is enabled but does not see that perf_events has been assigned. Add pairing read and write memory barriers to guarantee that if CPU1 sees that kprobe functionality is enabled, it must also see that perf_events has been assigned. Link: https://lore.kernel.org/all/20251001022025.44626-1-chenyuan_fl@163.com/ Fixes: 50d7805 ("tracing/kprobes: Add probe handler dispatcher to support perf and ftrace concurrent use") Cc: stable@vger.kernel.org Signed-off-by: Yuan Chen <chenyuan@kylinos.cn> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> [ Adjust context ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 875fb3f commit 0fa388a

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

kernel/trace/trace_fprobe.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,14 @@ static int fentry_dispatcher(struct fprobe *fp, unsigned long entry_ip,
343343
void *entry_data)
344344
{
345345
struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
346+
unsigned int flags = trace_probe_load_flag(&tf->tp);
346347
int ret = 0;
347348

348-
if (trace_probe_test_flag(&tf->tp, TP_FLAG_TRACE))
349+
if (flags & TP_FLAG_TRACE)
349350
fentry_trace_func(tf, entry_ip, regs);
351+
350352
#ifdef CONFIG_PERF_EVENTS
351-
if (trace_probe_test_flag(&tf->tp, TP_FLAG_PROFILE))
353+
if (flags & TP_FLAG_PROFILE)
352354
ret = fentry_perf_func(tf, entry_ip, regs);
353355
#endif
354356
return ret;
@@ -360,11 +362,12 @@ static void fexit_dispatcher(struct fprobe *fp, unsigned long entry_ip,
360362
void *entry_data)
361363
{
362364
struct trace_fprobe *tf = container_of(fp, struct trace_fprobe, fp);
365+
unsigned int flags = trace_probe_load_flag(&tf->tp);
363366

364-
if (trace_probe_test_flag(&tf->tp, TP_FLAG_TRACE))
367+
if (flags & TP_FLAG_TRACE)
365368
fexit_trace_func(tf, entry_ip, ret_ip, regs, entry_data);
366369
#ifdef CONFIG_PERF_EVENTS
367-
if (trace_probe_test_flag(&tf->tp, TP_FLAG_PROFILE))
370+
if (flags & TP_FLAG_PROFILE)
368371
fexit_perf_func(tf, entry_ip, ret_ip, regs, entry_data);
369372
#endif
370373
}

kernel/trace/trace_kprobe.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,14 +1799,15 @@ static int kprobe_register(struct trace_event_call *event,
17991799
static int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs)
18001800
{
18011801
struct trace_kprobe *tk = container_of(kp, struct trace_kprobe, rp.kp);
1802+
unsigned int flags = trace_probe_load_flag(&tk->tp);
18021803
int ret = 0;
18031804

18041805
raw_cpu_inc(*tk->nhit);
18051806

1806-
if (trace_probe_test_flag(&tk->tp, TP_FLAG_TRACE))
1807+
if (flags & TP_FLAG_TRACE)
18071808
kprobe_trace_func(tk, regs);
18081809
#ifdef CONFIG_PERF_EVENTS
1809-
if (trace_probe_test_flag(&tk->tp, TP_FLAG_PROFILE))
1810+
if (flags & TP_FLAG_PROFILE)
18101811
ret = kprobe_perf_func(tk, regs);
18111812
#endif
18121813
return ret;
@@ -1818,6 +1819,7 @@ kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs)
18181819
{
18191820
struct kretprobe *rp = get_kretprobe(ri);
18201821
struct trace_kprobe *tk;
1822+
unsigned int flags;
18211823

18221824
/*
18231825
* There is a small chance that get_kretprobe(ri) returns NULL when
@@ -1830,10 +1832,11 @@ kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs)
18301832
tk = container_of(rp, struct trace_kprobe, rp);
18311833
raw_cpu_inc(*tk->nhit);
18321834

1833-
if (trace_probe_test_flag(&tk->tp, TP_FLAG_TRACE))
1835+
flags = trace_probe_load_flag(&tk->tp);
1836+
if (flags & TP_FLAG_TRACE)
18341837
kretprobe_trace_func(tk, ri, regs);
18351838
#ifdef CONFIG_PERF_EVENTS
1836-
if (trace_probe_test_flag(&tk->tp, TP_FLAG_PROFILE))
1839+
if (flags & TP_FLAG_PROFILE)
18371840
kretprobe_perf_func(tk, ri, regs);
18381841
#endif
18391842
return 0; /* We don't tweak kernel, so just return 0 */

kernel/trace/trace_probe.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,21 @@ struct event_file_link {
269269
struct list_head list;
270270
};
271271

272+
static inline unsigned int trace_probe_load_flag(struct trace_probe *tp)
273+
{
274+
return smp_load_acquire(&tp->event->flags);
275+
}
276+
272277
static inline bool trace_probe_test_flag(struct trace_probe *tp,
273278
unsigned int flag)
274279
{
275-
return !!(tp->event->flags & flag);
280+
return !!(trace_probe_load_flag(tp) & flag);
276281
}
277282

278283
static inline void trace_probe_set_flag(struct trace_probe *tp,
279284
unsigned int flag)
280285
{
281-
tp->event->flags |= flag;
286+
smp_store_release(&tp->event->flags, tp->event->flags | flag);
282287
}
283288

284289
static inline void trace_probe_clear_flag(struct trace_probe *tp,

kernel/trace/trace_uprobe.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,7 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
15311531
struct trace_uprobe *tu;
15321532
struct uprobe_dispatch_data udd;
15331533
struct uprobe_cpu_buffer *ucb = NULL;
1534+
unsigned int flags;
15341535
int ret = 0;
15351536

15361537
tu = container_of(con, struct trace_uprobe, consumer);
@@ -1545,11 +1546,12 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
15451546
if (WARN_ON_ONCE(!uprobe_cpu_buffer))
15461547
return 0;
15471548

1548-
if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
1549+
flags = trace_probe_load_flag(&tu->tp);
1550+
if (flags & TP_FLAG_TRACE)
15491551
ret |= uprobe_trace_func(tu, regs, &ucb);
15501552

15511553
#ifdef CONFIG_PERF_EVENTS
1552-
if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
1554+
if (flags & TP_FLAG_PROFILE)
15531555
ret |= uprobe_perf_func(tu, regs, &ucb);
15541556
#endif
15551557
uprobe_buffer_put(ucb);
@@ -1562,6 +1564,7 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
15621564
struct trace_uprobe *tu;
15631565
struct uprobe_dispatch_data udd;
15641566
struct uprobe_cpu_buffer *ucb = NULL;
1567+
unsigned int flags;
15651568

15661569
tu = container_of(con, struct trace_uprobe, consumer);
15671570

@@ -1573,11 +1576,12 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con,
15731576
if (WARN_ON_ONCE(!uprobe_cpu_buffer))
15741577
return 0;
15751578

1576-
if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))
1579+
flags = trace_probe_load_flag(&tu->tp);
1580+
if (flags & TP_FLAG_TRACE)
15771581
uretprobe_trace_func(tu, func, regs, &ucb);
15781582

15791583
#ifdef CONFIG_PERF_EVENTS
1580-
if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))
1584+
if (flags & TP_FLAG_PROFILE)
15811585
uretprobe_perf_func(tu, func, regs, &ucb);
15821586
#endif
15831587
uprobe_buffer_put(ucb);

0 commit comments

Comments
 (0)