Commit d4ba0b06 authored by Kan Liang's avatar Kan Liang Committed by Peter Zijlstra
Browse files

perf/x86/intel/uncore: Clean up error handling path of iio mapping 



The error handling path of iio mapping looks fragile. We already fixed
one issue caused by it, commit f797f05d ("perf/x86/intel/uncore:
Fix for iio mapping on Skylake Server"). Clean up the error handling
path and make the code robust.

Reported-by: default avatargushengxian <gushengxian@yulong.com>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/40e66cf9-398b-20d7-ce4d-433be6e08921@linux.intel.com
parent 87bf399f

arch/x86/events/intel/uncore_snbep.c

+4 −2
Original line number Diff line number Diff line
@@ -3789,11 +3789,11 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) 
	/* One more for NULL. */

	attrs = kcalloc((uncore_max_dies() + 1), sizeof(*attrs), GFP_KERNEL);

	if (!attrs)

		goto err;

		goto clear_topology;



	eas = kcalloc(uncore_max_dies(), sizeof(*eas), GFP_KERNEL);

	if (!eas)

		goto err;

		goto clear_attrs;



	for (die = 0; die < uncore_max_dies(); die++) {

		sprintf(buf, "die%ld", die);
@@ -3814,7 +3814,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) 
	for (; die >= 0; die--)

		kfree(eas[die].attr.attr.name);

	kfree(eas);

clear_attrs:

	kfree(attrs);

clear_topology:

	kfree(type->topology);

clear_attr_update:

	type->attr_update = NULL;