Commit 1c74516c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Boundary condition fixes for bugs unearthed by the perf fuzzer"

* tag 'perf-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix unchecked MSR access error caused by VLBR_EVENT
  perf/x86/intel: Fix a crash caused by zero PEBS status
parents 5ba33b48 2dc0572f

arch/x86/events/intel/core.c

+3 −0
Original line number Diff line number Diff line
@@ -3659,6 +3659,9 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		return ret;



	if (event->attr.precise_ip) {

		if ((event->attr.config & INTEL_ARCH_EVENT_MASK) == INTEL_FIXED_VLBR_EVENT)

			return -EINVAL;



		if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.watermark))) {

			event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;

			if (!(event->attr.sample_type &

arch/x86/events/intel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -2010,7 +2010,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_d 
		 */

		if (!pebs_status && cpuc->pebs_enabled &&

			!(cpuc->pebs_enabled & (cpuc->pebs_enabled-1)))

			pebs_status = cpuc->pebs_enabled;

			pebs_status = p->status = cpuc->pebs_enabled;



		bit = find_first_bit((unsigned long *)&pebs_status,

					x86_pmu.max_pebs_events);