diff options
| author | Kan Liang <kan.liang@linux.intel.com> | 2021-06-24 20:17:57 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-07-02 15:58:33 +0200 |
| commit | d4ba0b06306a70c99a43f9d452886a86e2d3bd26 (patch) | |
| tree | 718c0d2067eedfc74cacc118bbcb1a374403d204 | |
| parent | perf/x86/cstate: Add ICELAKE_X and ICELAKE_D support (diff) | |
| download | linux-d4ba0b06306a70c99a43f9d452886a86e2d3bd26.tar.xz linux-d4ba0b06306a70c99a43f9d452886a86e2d3bd26.zip | |
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 f797f05d917f ("perf/x86/intel/uncore:
Fix for iio mapping on Skylake Server"). Clean up the error handling
path and make the code robust.
Reported-by: gushengxian <gushengxian@yulong.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/40e66cf9-398b-20d7-ce4d-433be6e08921@linux.intel.com
| -rw-r--r-- | arch/x86/events/intel/uncore_snbep.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 3a75a2c601c2..1f7bb4898a9d 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -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 @@ err: 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; |