From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-kselftest@vger.kernel.org,
Reinette Chatre <reinette.chatre@intel.com>,
Shuah Khan <shuah@kernel.org>,
Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Colin Ian King <colin.i.king@gmail.com>,
linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v3 02/19] selftests/resctrl: Don't leak buffer in fill_cache()
Date: Mon, 5 Jun 2023 21:01:28 +0300 [thread overview]
Message-ID: <20230605180145.112924-3-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230605180145.112924-1-ilpo.jarvinen@linux.intel.com>
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(-)
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;
}
--
2.30.2
next prev parent reply other threads:[~2023-06-05 18:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-05 18:01 [PATCH v3 00/19] selftests/resctrl: Fixes and cleanups Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 01/19] selftests/resctrl: Add resctrl.h into build deps Ilpo Järvinen
2023-06-05 18:01 ` Ilpo Järvinen [this message]
2023-06-05 18:01 ` [PATCH v3 03/19] selftests/resctrl: Unmount resctrl FS if child fails to run benchmark Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 04/19] selftests/resctrl: Close perf value read fd on errors Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 05/19] selftests/resctrl: Unmount resctrl FS before starting the first test Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 06/19] selftests/resctrl: Move resctrl FS mount/umount to higher level Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 07/19] selftests/resctrl: Refactor remount_resctrl(bool mum_resctrlfs) to mount_resctrl() Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 08/19] selftests/resctrl: Remove mum_resctrlfs from struct resctrl_val_param Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 09/19] selftests/resctrl: Convert span to size_t Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 10/19] selftests/resctrl: Express span internally in bytes Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 11/19] selftests/resctrl: Remove duplicated preparation for span arg Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 12/19] selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf() Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 13/19] selftests/resctrl: Remove unnecessary startptr global from fill_buf Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 14/19] selftests/resctrl: Improve parameter consistency in fill_buf Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 15/19] selftests/resctrl: Don't pass test name to fill_buf Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 16/19] selftests/resctrl: Don't use variable argument list for ->setup() Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 17/19] selftests/resctrl: Move CAT/CMT test global vars to function they are used in Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 18/19] selftests/resctrl: Pass the real number of tests to show_cache_info() Ilpo Järvinen
2023-06-05 18:01 ` [PATCH v3 19/19] selftests/resctrl: Remove test type checks from cat_val() Ilpo Järvinen
2023-06-12 6:02 ` [PATCH v3 00/19] selftests/resctrl: Fixes and cleanups Shaopeng Tan (Fujitsu)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230605180145.112924-3-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=colin.i.king@gmail.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=tan.shaopeng@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox