perf/core: Prevent UBSAN negative‑idx shift by throttle/unthrottle group
PATCH 1/1 perf/core: Prevent UBSAN negative‑idx shift by throttle/unthrottle group
Where perf_event_throttle_group() and perf_event_unthrottle_group() would invoke pmu->start()/stop() on events still in the OFF state, leaving event->hw.idx == -1 and triggering UBSAN shift-out-of-bounds errors (negative shift exponent) in pmu enable/disable event. By checking 'event->state > PERF_EVENT_STATE_OFF' for both the group leader and each sibling, this ensure only started events with valid hw.idx values are passed to the PMU, preventing negative-index shifts undefined behavior.
The issue is reproducible using the syzlang and C reproducer available:
Fixes 9734e25fbf5a ("perf: Fix the throttle logic for a group")
Signed-off-by Yunseong Kim <[email protected]>
Tested-by Yunseong Kim <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Yeoreum Yun <[email protected]>
--- kernel/events/core.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
kernel/events/core.c +16 -6
@@ -2684,18 +2684,28 @@ static void perf_event_unthrottle_group(struct perf_event *event, bool skip_star {struct perf_event *sibling, *leader = event->group_leader; -perf_event_unthrottle (leader, skip_start_event ? leader != event : true); -for_each_sibling_event (sibling, leader) -perf_event_unthrottle (sibling, skip_start_event ? sibling != event : true); +if (leader->state >PERF_EVENT_STATE_OFF ) +perf_event_unthrottle (leader, + skip_start_event ? leader != event : true); + +for_each_sibling_event (sibling, leader) { +if (sibling->state >PERF_EVENT_STATE_OFF ) +perf_event_unthrottle (sibling, + skip_start_event ? sibling != event : true); + } }static void perf_event_throttle_group (struct perf_event *event) {struct perf_event *sibling, *leader = event->group_leader; -perf_event_throttle (leader); -for_each_sibling_event (sibling, leader) -perf_event_throttle (sibling); +if (leader->state >PERF_EVENT_STATE_OFF ) +perf_event_throttle (leader); + +for_each_sibling_event (sibling, leader) { +if (sibling->state >PERF_EVENT_STATE_OFF ) +perf_event_throttle (sibling); + } } static int
Signature · 1 line
2.50.0