Commit 80c65fdb authored Jun 29, 2017 by Kan Liang Committed by Thomas Gleixner Jun 29, 2017

perf/x86/intel/uncore: Fix wrong box pointer check



Should not init a NULL box. It will cause system crash.
The issue looks like caused by a typo.

This was not noticed because there is no NULL box. Also, for most
boxes, they are enabled by default. The init code is not critical.

Fixes: fff4b87e ("perf/x86/intel/uncore: Make package handling more robust")
Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20170629190926.2456-1-kan.liang@intel.com

parent 98fe3633

arch/x86/events/intel/uncore.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1170,7 +1170,7 @@ static int uncore_event_cpu_online(unsigned int cpu)
	pmu = type->pmus;		pmu = type->pmus;
	for (i = 0; i < type->num_boxes; i++, pmu++) {		for (i = 0; i < type->num_boxes; i++, pmu++) {
	box = pmu->boxes[pkg];		box = pmu->boxes[pkg];
	if (!box && atomic_inc_return(&box->refcnt) == 1)		if (box && atomic_inc_return(&box->refcnt) == 1)
	uncore_box_init(box);		uncore_box_init(box);
	}		}
	}		}