| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aF2Fx-cYy6B69d4S@google.com>
Date: Thu, 26 Jun 2025 10:39:19 -0700
From: Namhyung Kim <namhyung@...nel.org>
To: Collin Funk <collin.funk1@...il.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>, Ian Rogers <irogers@...gle.com>,
Adrian Hunter <adrian.hunter@...el.com>,
"Liang, Kan" <kan.liang@...ux.intel.com>,
James Clark <james.clark@...aro.org>,
Charlie Jenkins <charlie@...osinc.com>,
Ravi Bangoria <ravi.bangoria@....com>,
"Masami Hiramatsu (Google)" <mhiramat@...nel.org>,
linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3] perf build: Specify that shellcheck should use the
bash dialect.
Hello,
On Mon, Jun 23, 2025 at 10:44:59PM -0700, Collin Funk wrote:
> When someone has a global shellcheckrc file, for example at
> ~/.config/shellcheckrc, with the directive 'shell=sh', building perf
> will fail with many shellcheck errors like:
>
> In tests/shell/base_probe/test_adding_kernel.sh line 294:
> (( TEST_RESULT += $? ))
> ^---------------------^ SC3006 (warning): In POSIX sh, standalone ((..)) is undefined.
>
> For more information:
> https://www.shellcheck.net/wiki/SC3006 -- In POSIX sh, standalone ((..)) is...
> make[5]: *** [tests/Build:91: tests/shell/base_probe/test_adding_kernel.sh.shellcheck_log] Error 1
>
> Passing the '-s bash' option ensures that it runs correctly regardless
> of a developers global configuration.
>
> This patch adds '-s bash' and other options to the SHELLCHECK variable
> in Makefile.perf and makes use of the variable consistently.
>
> Signed-off-by: Collin Funk <collin.funk1@...il.com>
> ---
> tools/perf/Build | 2 +-
> tools/perf/Makefile.perf | 2 +-
> tools/perf/arch/x86/Build | 2 +-
> tools/perf/arch/x86/tests/Build | 2 +-
> tools/perf/tests/Build | 2 +-
> tools/perf/trace/beauty/Build | 2 +-
> tools/perf/util/Build | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/Build b/tools/perf/Build
> index 06107f1e1d42..b03cc59dabf8 100644
> --- a/tools/perf/Build
> +++ b/tools/perf/Build
> @@ -73,7 +73,7 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-y += $(SHELL_TEST_LOGS)
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index d4c7031b01a7..e0cf8db5462b 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -252,7 +252,7 @@ endif
> ifeq ($(NO_SHELLCHECK),1)
> SHELLCHECK :=
> else
> - SHELLCHECK := $(shell which shellcheck 2> /dev/null)
> + SHELLCHECK := $(shell which shellcheck 2> /dev/null) -s bash -a -S warning
This caused a trouble on a test environment where 'which' (and
'shellcheck' as well) is not available. Now it makes SHELLCHECK
non-empty unconditionally.
So the version check below failed like below:
make[1]: which: No such file or directory
/bin/sh: - : invalid option
Usage: /bin/sh [GNU long option] [option] ...
/bin/sh [GNU long option] [option] script-file ...
GNU long options:
--debug
--debugger
--dump-po-strings
--dump-strings
--help
--init-file
--login
--noediting
--noprofile
--norc
--posix
--pretty-print
--rcfile
--rpm-requires
--restricted
--verbose
--version
Shell options:
-ilrsD or -c command or -O shopt_option (invocation only)
-abefhkmnptuvxBCEHPT or -o option
expr: syntax error: unexpected argument ‘060’
And it failed to build later on shellchecks.
TEST /build/arch/x86/tests/gen-insn-x86-dat.sh.shellcheck_log
/bin/sh: line 1: -s: command not found
make[6]: *** [arch/x86/tests/Build:25: /build/arch/x86/tests/gen-insn-x86-dat.sh.shellcheck_log] Error 1
make[6]: *** Waiting for unfinished jobs....
I think it's better to convert 'which' to 'command -v' (in other places
too) and add the options after the version check.
Thanks,
Namhyung
> endif
>
> # shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
> diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build
> index afae7b8f6bd6..d31a1168757c 100644
> --- a/tools/perf/arch/x86/Build
> +++ b/tools/perf/arch/x86/Build
> @@ -10,6 +10,6 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-test-y += $(SHELL_TEST_LOGS)
> diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build
> index 5e00cbfd2d56..01d5527f38c7 100644
> --- a/tools/perf/arch/x86/tests/Build
> +++ b/tools/perf/arch/x86/tests/Build
> @@ -22,6 +22,6 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-test-y += $(SHELL_TEST_LOGS)
> diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
> index 2181f5a92148..d6c35dd0de3b 100644
> --- a/tools/perf/tests/Build
> +++ b/tools/perf/tests/Build
> @@ -89,7 +89,7 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-test-y += $(SHELL_TEST_LOGS)
>
> diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
> index f50ebdc445b8..561590ee8cda 100644
> --- a/tools/perf/trace/beauty/Build
> +++ b/tools/perf/trace/beauty/Build
> @@ -31,6 +31,6 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-y += $(SHELL_TEST_LOGS)
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 7910d908c814..2dfa09a6f27d 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -421,7 +421,7 @@ endif
>
> $(OUTPUT)%.shellcheck_log: %
> $(call rule_mkdir)
> - $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
> + $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
>
> perf-util-y += $(SHELL_TEST_LOGS)
>
> --
> 2.49.0
>
Powered by blists - more mailing lists