Skip to content

Commit 65a9926

Browse files
namhyungIngo Molnar
authored andcommitted
perf/x86: Check data address for IBS software filter
The IBS software filter is filtering kernel samples for regular users in the PMI handler. It checks the instruction address in the IBS register to determine if it was in kernel mode or not. But it turns out that it's possible to report a kernel data address even if the instruction address belongs to user-space. Matteo Rizzo found that when an instruction raises an exception, IBS can report some kernel data addresses like IDT while holding the faulting instruction's RIP. To prevent an information leak, it should double check if the data address in PERF_SAMPLE_DATA is in the kernel space as well. [ mingo: Clarified the changelog ] Suggested-by: Matteo Rizzo <matteorizzo@google.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20250317163755.1842589-1-namhyung@kernel.org
1 parent 4701f33 commit 65a9926

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

arch/x86/events/amd/ibs.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,8 +1128,13 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
11281128
regs.flags |= PERF_EFLAGS_EXACT;
11291129
}
11301130

1131+
if (perf_ibs == &perf_ibs_op)
1132+
perf_ibs_parse_ld_st_data(event->attr.sample_type, &ibs_data, &data);
1133+
11311134
if ((event->attr.config2 & IBS_SW_FILTER_MASK) &&
1132-
perf_exclude_event(event, &regs)) {
1135+
(perf_exclude_event(event, &regs) ||
1136+
((data.sample_flags & PERF_SAMPLE_ADDR) &&
1137+
event->attr.exclude_kernel && kernel_ip(data.addr)))) {
11331138
throttle = perf_event_account_interrupt(event);
11341139
goto out;
11351140
}
@@ -1144,9 +1149,6 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
11441149
perf_sample_save_raw_data(&data, event, &raw);
11451150
}
11461151

1147-
if (perf_ibs == &perf_ibs_op)
1148-
perf_ibs_parse_ld_st_data(event->attr.sample_type, &ibs_data, &data);
1149-
11501152
/*
11511153
* rip recorded by IbsOpRip will not be consistent with rsp and rbp
11521154
* recorded as part of interrupt regs. Thus we need to use rip from

0 commit comments

Comments
 (0)