mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
perf/amd/ibs: Avoid calling perf_allow_kernel() from the IBS NMI handler
[ Upstream commitb0a0914262] Calling perf_allow_kernel() from the NMI context is unsafe and could be fatal. Capture the permission at event-initialization time by storing it in event->hw.flags, and have the NMI handler rely on that cached flag instead of making the call directly. Fixes:50a53b60e1("perf/amd/ibs: Prevent leaking sensitive data to userspace") Reported-by: Sadasivan Shaiju <sadasivan.shaiju2@amd.com> Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Namhyung Kim <namhyung@kernel.org> Link: https://patch.msgid.link/20260216042216.1440-5-ravi.bangoria@amd.com Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
aaf2712f76
commit
2783ed2442
@@ -313,6 +313,9 @@ static int perf_ibs_init(struct perf_event *event)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (perf_allow_kernel())
|
||||
hwc->flags |= PERF_X86_EVENT_UNPRIVILEGED;
|
||||
|
||||
if (hwc->sample_period) {
|
||||
if (config & perf_ibs->cnt_mask)
|
||||
/* raw max_cnt may not be set */
|
||||
@@ -1342,7 +1345,7 @@ fail:
|
||||
* unprivileged users.
|
||||
*/
|
||||
if ((event->attr.sample_type & PERF_SAMPLE_RAW) &&
|
||||
perf_allow_kernel()) {
|
||||
(hwc->flags & PERF_X86_EVENT_UNPRIVILEGED)) {
|
||||
perf_ibs_phyaddr_clear(perf_ibs, &ibs_data);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,3 +23,4 @@ PERF_ARCH(PEBS_LAT_HYBRID, 0x0020000) /* ld and st lat for hybrid */
|
||||
PERF_ARCH(NEEDS_BRANCH_STACK, 0x0040000) /* require branch stack setup */
|
||||
PERF_ARCH(BRANCH_COUNTERS, 0x0080000) /* logs the counters in the extra space of each branch */
|
||||
PERF_ARCH(ACR, 0x0100000) /* Auto counter reload */
|
||||
PERF_ARCH(UNPRIVILEGED, 0x0200000) /* Unprivileged event (wrt perf_allow_kernel()) */
|
||||
|
||||
Reference in New Issue
Block a user