]> git.itanic.dy.fi Git - linux-stable/commitdiff
selftests/resctrl: Ensure the benchmark commands fits to its array
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 4 Sep 2023 09:53:32 +0000 (12:53 +0300)
committerShuah Khan <skhan@linuxfoundation.org>
Fri, 13 Oct 2023 20:28:26 +0000 (14:28 -0600)
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>
Reviewed-by: "Wieczor-Retman, Maciej" <maciej.wieczor-retman@intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/selftests/resctrl/resctrl_tests.c

index d511daeb6851e6078d4bffef83f5b43360af3c28..9e2bc8ba95f13b945326f35cb30188e9c87ed30c 100644 (file)
@@ -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)
+                               ksft_exit_fail_msg("Too long benchmark command argument.\n");
                        sprintf(benchmark_cmd[i - ben_ind], "%s", argv[i]);
                }
                benchmark_cmd[ben_count] = NULL;