From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Reinette Chatre <reinette.chatre@intel.com>,
Shuah Khan <skhan@linuxfoundation.org>,
linux-kselftest@vger.kernel.org, Shuah Khan <shuah@kernel.org>,
Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>,
Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Cc: "Fenghua Yu" <fenghua.yu@intel.com>,
"Babu Moger" <babu.moger@amd.com>,
LKML <linux-kernel@vger.kernel.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v4 1/8] selftests/resctrl: Ensure the benchmark commands fits to its array
Date: Thu, 31 Aug 2023 14:08:36 +0300 [thread overview]
Message-ID: <20230831110843.26719-2-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230831110843.26719-1-ilpo.jarvinen@linux.intel.com>
Benchmark command is copied into an array in the stack. The array is
BENCHMARK_ARGS items long but the command line could try to provide a
longer command. Argument size is also fixed by BENCHMARK_ARG_SIZE (63
bytes of space after fitting the terminating \0 character) and user
could have inputted argument longer than that.
Return error in case the benchmark command does not fit to the space
allocated for it.
Fixes: ecdbb911f22d ("selftests/resctrl: Add MBM test")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
---
tools/testing/selftests/resctrl/resctrl_tests.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index d511daeb6851..a9331b31c32d 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -255,9 +255,14 @@ int main(int argc, char **argv)
return ksft_exit_skip("Not running as root. Skipping...\n");
if (has_ben) {
+ if (argc - ben_ind >= BENCHMARK_ARGS)
+ ksft_exit_fail_msg("Too long benchmark command.\n");
+
/* Extract benchmark command from command line. */
for (i = ben_ind; i < argc; i++) {
benchmark_cmd[i - ben_ind] = benchmark_cmd_area[i];
+ if (strlen(argv[i]) >= BENCHMARK_ARG_SIZE - 1)
+ ksft_exit_fail_msg("Too long benchmark command argument.\n");
sprintf(benchmark_cmd[i - ben_ind], "%s", argv[i]);
}
benchmark_cmd[ben_count] = NULL;
--
2.30.2
next prev parent reply other threads:[~2023-08-31 11:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 11:08 [PATCH v4 0/8] selftests/resctrl: Rework benchmark command handling Ilpo Järvinen
2023-08-31 11:08 ` Ilpo Järvinen [this message]
2023-08-31 21:25 ` [PATCH v4 1/8] selftests/resctrl: Ensure the benchmark commands fits to its array Reinette Chatre
2023-09-01 9:18 ` Ilpo Järvinen
2023-08-31 11:08 ` [PATCH v4 2/8] selftests/resctrl: Correct benchmark command help Ilpo Järvinen
2023-08-31 11:08 ` [PATCH v4 3/8] selftests/resctrl: Remove bw_report and bm_type from main() Ilpo Järvinen
2023-08-31 11:08 ` [PATCH v4 4/8] selftests/resctrl: Simplify span lifetime Ilpo Järvinen
2023-08-31 11:08 ` [PATCH v4 5/8] selftests/resctrl: Reorder resctrl FS prep code and benchmark_cmd init Ilpo Järvinen
2023-08-31 21:25 ` Reinette Chatre
2023-08-31 11:08 ` [PATCH v4 6/8] selftests/resctrl: Make benchmark command const and build it with pointers Ilpo Järvinen
2023-08-31 21:25 ` Reinette Chatre
2023-08-31 11:08 ` [PATCH v4 7/8] selftests/resctrl: Remove ben_count variable Ilpo Järvinen
2023-08-31 11:08 ` [PATCH v4 8/8] selftests/resctrl: Cleanup benchmark argument parsing Ilpo Järvinen
2023-08-31 21:26 ` Reinette Chatre
2023-09-01 5:28 ` [PATCH v4 0/8] selftests/resctrl: Rework benchmark command handling Maciej Wieczór-Retman
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=20230831110843.26719-2-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=babu.moger@amd.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.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
Powered by JetHome