Re: [PATCH] kbuild: pahole-version: avoid errors if executing fails

[Nicolas Schier]

On Sun, Jul 28, 2024 at 02:55:27PM +0200, Miguel Ojeda wrote:
> Like patch "rust: suppress error messages from
> CONFIG_{RUSTC,BINDGEN}_VERSION_TEXT" [1], do not assume the file existing
> and being executable implies executing it will succeed. Instead, bail
> out if executing it fails for any reason.
> 
> For instance, `pahole` may be built for another architecture, may be a
> program we do not expect or may be completely broken:
> 
>     $ echo 'bad' > bad-pahole
>     $ chmod u+x bad-pahole
>     $ make PAHOLE=./bad-pahole defconfig
>     ...
>     ./bad-pahole: 1: bad: not found
>     init/Kconfig:112: syntax error
>     init/Kconfig:112: invalid statement
> 
> Link: https://lore.kernel.org/rust-for-linux/20240727140302.1806011-1-masahiroy@xxxxxxxxxx/ [1]
> Signed-off-by: Miguel Ojeda <ojeda@xxxxxxxxxx>
> ---
>  scripts/pahole-version.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/pahole-version.sh b/scripts/pahole-version.sh
> index f8a32ab93ad1..a35b557f1901 100755
> --- a/scripts/pahole-version.sh
> +++ b/scripts/pahole-version.sh
> @@ -5,9 +5,9 @@
>  #
>  # Prints pahole's version in a 3-digit form, such as 119 for v1.19.
>  
> -if [ ! -x "$(command -v "$@")" ]; then
> +if output=$("$@" --version 2>/dev/null); then
> +	echo "$output" | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'
> +else
>  	echo 0
>  	exit 1
>  fi
> -
> -"$@" --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'
> 
> base-commit: 256abd8e550ce977b728be79a74e1729438b4948
> -- 
> 2.45.2
> 

thanks, looks good to me.

Reviewed-by: Nicolas Schier <nicolas@xxxxxxxxx>