]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/papr_scm: Fix leaking nvdimm_events_map elements
authorVaibhav Jain <vaibhav@linux.ibm.com>
Wed, 11 May 2022 08:26:36 +0000 (13:56 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 22 May 2022 05:58:31 +0000 (15:58 +1000)
commitf6eba63606ce7aa856c645fbd28f0d4ecdd019e6
treec5124cbc984b060d9c1a17235e0f65f343378930
parent28de78d62f39da454fc66183cd5d3f6aa04e1841
powerpc/papr_scm: Fix leaking nvdimm_events_map elements

Right now 'char *' elements allocated for individual 'stat_id' in
'papr_scm_priv.nvdimm_events_map[]' during papr_scm_pmu_check_events(), get
leaked in papr_scm_remove() and papr_scm_pmu_register(),
papr_scm_pmu_check_events() error paths.

Also individual 'stat_id' arent NULL terminated 'char *' instead they are fixed
8-byte sized identifiers. However papr_scm_pmu_register() assumes it to be a
NULL terminated 'char *' and at other places it assumes it to be a
'papr_scm_perf_stat.stat_id' sized string which is 8-byes in size.

Fix this by allocating the memory for papr_scm_priv.nvdimm_events_map to also
include space for 'stat_id' entries. This is possible since number of available
events/stat_ids are known upfront. This saves some memory and one extra level of
indirection from 'nvdimm_events_map' to 'stat_id'. Also rest of the code
can continue to call 'kfree(papr_scm_priv.nvdimm_events_map)' without needing to
iterate over the array and free up individual elements.

Fixes: 47b6f0f87f11 ("powerpc/papr_scm: Add perf interface support")
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220511082637.646714-1-vaibhav@linux.ibm.com
arch/powerpc/platforms/pseries/papr_scm.c