Messages in this thread | | | From | Ian Rogers <> | Date | Fri, 16 Feb 2024 14:53:44 -0800 | Subject | Re: [PATCH v4 6/8] perf tests: Use scandirat for shell script finding |
| |
On Fri, Feb 16, 2024 at 12:22 PM Namhyung Kim <namhyung@kernel.org> wrote: > > On Tue, Feb 13, 2024 at 8:54 PM Ian Rogers <irogers@google.com> wrote: > > > > Avoid filename appending buffers by using openat, faccessat and > > scandirat more widely. Turn the script's path back to a file name > > using readlink from /proc/<pid>/fd/<fd>. > > > > Read the script's description using api/io.h to avoid fdopen > > conversions. Whilst reading perform additional sanity checks on the > > script's contents. > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/tests/builtin-test.c | 21 ++--- > > tools/perf/tests/tests-scripts.c | 144 ++++++++++++++++++------------- > > tools/perf/tests/tests-scripts.h | 1 - > > 3 files changed, 95 insertions(+), 71 deletions(-) > > > > diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c > > index eff3c62e9b47..6d5001daaf63 100644 > > --- a/tools/perf/tests/builtin-test.c > > +++ b/tools/perf/tests/builtin-test.c > > @@ -300,22 +300,20 @@ static int test_and_print(struct test_suite *t, int subtest) > > } > > > > struct shell_test { > > - const char *dir; > > const char *file; > > }; > > > > static int shell_test__run(struct test_suite *test, int subdir __maybe_unused) > > { > > int err; > > - char script[PATH_MAX]; > > struct shell_test *st = test->priv; > > + char *cmd; > > > > - path__join(script, sizeof(script) - 3, st->dir, st->file); > > - > > - if (verbose > 0) > > - strncat(script, " -v", sizeof(script) - strlen(script) - 1); > > - > > - err = system(script); > > + asprintf(&cmd, "%s%s", st->file, verbose ? " -v" : ""); > > + if (!cmd) > > + return TEST_FAIL; > > It fails to build. > > tests/tests-scripts.c: In function ‘shell_test__run’: > tests/tests-scripts.c:130:9: error: ignoring return value of > ‘asprintf’ declared with attribute ‘warn_unused_result’ > [-Werror=unused-result] > 130 | asprintf(&cmd, "%s%s", file, verbose ? " -v" : ""); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Thanks, 1 liner fix in v5 on its way. I'll add -Werror=unused-result to my EXTRA_CFLAGS.
Ian
> Thanks, > Namhyung > > > > + err = system(cmd); > > + free(cmd); > > if (!err) > > return TEST_OK; > >
| |