perf test: Avoid shell test description infinite loop
Ian Rogers
reviewerPATCH 1/1 perf test: Avoid shell test description infinite loop
for_each_shell_test is already strict in expecting tests to be files and executable. It is sometimes possible when it iterates over all files that it finds one that is executable and lacks a newline character. When this happens the loop never terminates as it doesn't check for EOF. Add the EOF check to make this loop at least bounded by the file size.
If the description is returned as NULL then also skip the test.
--- tools/perf/tests/builtin-test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/tests/builtin-test.c +6 -2
@@ -279,6 +279,7 @@ static const char *shell_test__description(char *description, size_t size, {FILE *fp;char filename[PATH_MAX ]; +int ch;path__join (filename,sizeof (filename), path, name); fp =fopen (filename,"r" );
@@ -286,7 +287,9 @@ static const char *shell_test__description(char *description, size_t size,return NULL ;/* Skip shebang */ -while (fgetc (fp) !='\n' ); +do { + ch =fgetc (fp); + }while (ch !=EOF && ch !='\n' ); description =fgets (description, size, fp);fclose (fp);
@@ -419,7 +422,8 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width, .priv = &st, }; -if (!perf_test__matches (test_suite.desc, curr, argc, argv)) +if (test_suite.desc ==NULL || + !perf_test__matches (test_suite.desc, curr, argc, argv))continue ; st.file = ent->d_name;
Signature · 1 line
2.36.0.550.gb090851708-goog
Em Tue, May 17, 2022 at 01:41:44PM -0700, Ian Rogers escreveu:
Quoted 7 lines
for_each_shell_testis already strict in expecting tests to be files and executable. It is sometimes possible when it iterates over all files that it finds one that is executable and lacks a newline character. When this happens the loop never terminates as it doesn't check for EOF. Add the EOF check to make this loop at least bounded by the file size.If the description is returned as NULL then also skip the test.
Thanks, applied.
- Arnaldo
Quoted 40 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/builtin-test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tools/perf/tests/builtin-test.c +6
-2@@ -279,6 +279,7 @@ static const char *shell_test__description(char *description, size_t size, {FILE *fp;char filename[PATH_MAX ]; +int ch;path__join (filename,sizeof (filename), path, name); fp =fopen (filename,"r" );@@ -286,7 +287,9 @@ static const char *shell_test__description(char *description, size_t size,return NULL ;/* Skip shebang */ -while (fgetc (fp) !='\n' ); +do { + ch =fgetc (fp); + }while (ch !=EOF && ch !='\n' ); description =fgets (description, size, fp);fclose (fp);@@ -419,7 +422,8 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width, .priv = &st, }; -if (!perf_test__matches (test_suite.desc, curr, argc, argv)) +if (test_suite.desc ==NULL || + !perf_test__matches (test_suite.desc, curr, argc, argv))continue ; st.file = ent->d_name;Signature · 1 line
2.36.0.550.gb090851708-goog
Signature · 1 line
- Arnaldo