| Message ID | 20230713131932.133258-3-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2d320b1029ee7329ee0638181be967789775b962 |
| Headers | show |
| Series | selftests/resctrl: Fixes and cleanups | expand |
Hi Ilpo, On 7/13/2023 6:19 AM, Ilpo Järvinen wrote: > The error path in fill_cache() does return before the allocated buffer > is freed leaking the buffer. > > The leak was introduced when fill_cache_read() started to return errors > in c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on Could you please prefix the sha with "commit" to get a clean checkpatch.pl check? > open failed"), before that both fill functions always returned 0. > > Move free() earlier to prevent the mem leak. > > Fixes: c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed") > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Thank you for catching this. With the changelog update: Reviewed-by: Reinette Chatre <reinette.chatre@intel.com> Reinette
diff --git a/tools/testing/selftests/resctrl/fill_buf.c b/tools/testing/selftests/resctrl/fill_buf.c index 341cc93ca84c..3b328c844896 100644 --- a/tools/testing/selftests/resctrl/fill_buf.c +++ b/tools/testing/selftests/resctrl/fill_buf.c @@ -177,12 +177,13 @@ fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush, else ret = fill_cache_write(start_ptr, end_ptr, resctrl_val); + free(startptr); + if (ret) { printf("\n Error in fill cache read/write...\n"); return -1; } - free(startptr); return 0; }
The error path in fill_cache() does return before the allocated buffer is freed leaking the buffer. The leak was introduced when fill_cache_read() started to return errors in c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed"), before that both fill functions always returned 0. Move free() earlier to prevent the mem leak. Fixes: c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed") Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- tools/testing/selftests/resctrl/fill_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)