linux-kernel - Re: [PATCH] perf test: Fixed masked error condition in perf data convert test

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 16 Jan 2024 13:54:55 -0800
From: Namhyung Kim <namhyung@...nel.org>
To: James Clark <james.clark@....com>
Cc: linux-perf-users@...r.kernel.org, ilkka@...amperecomputing.com, 
	Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>, 
	Arnaldo Carvalho de Melo <acme@...nel.org>, Mark Rutland <mark.rutland@....com>, 
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>, 
	Ian Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>, 
	Athira Rajeev <atrajeev@...ux.vnet.ibm.com>, Anup Sharma <anupnewsmail@...il.com>, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] perf test: Fixed masked error condition in perf data
 convert test

On Fri, Jan 12, 2024 at 4:07 AM James Clark <james.clark@....com> wrote:
>
> The test does set -e, so any errors go straight to the exit handler,
> where it returns err=0 (success). Fix it by leaving err=1 from the
> beginning and only set the success code if it ran all the way to the end
> without errors.
>
> Also remove the exit code argument from the last exit because it doesn't
> do anything, it's always replaced by err in the exit handler.
>
> Fixes: 68d124182610 ("perf test: Add test validating JSON generated by 'perf data convert --to-json'")
> Signed-off-by: James Clark <james.clark@....com>

Acked-by: Namhyung Kim <namhyung@...nel.org>

Thanks,
Namhyung


> ---
>  tools/perf/tests/shell/test_perf_data_converter_json.sh | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/tests/shell/test_perf_data_converter_json.sh b/tools/perf/tests/shell/test_perf_data_converter_json.sh
> index c4f1b59d116f..1781b7215c11 100755
> --- a/tools/perf/tests/shell/test_perf_data_converter_json.sh
> +++ b/tools/perf/tests/shell/test_perf_data_converter_json.sh
> @@ -4,7 +4,7 @@
>
>  set -e
>
> -err=0
> +err=1
>
>  shelldir=$(dirname "$0")
>  # shellcheck source=lib/setup_python.sh
> @@ -36,7 +36,6 @@ test_json_converter_command()
>                 echo "Perf Data Converter Command to JSON [SUCCESS]"
>         else
>                 echo "Perf Data Converter Command to JSON [FAILED]"
> -               err=1
>                 exit
>         fi
>  }
> @@ -49,7 +48,6 @@ validate_json_format()
>                         echo "The file contains valid JSON format [SUCCESS]"
>                 else
>                         echo "The file does not contain valid JSON format [FAILED]"
> -                       err=1
>                         exit
>                 fi
>         else
> @@ -62,4 +60,7 @@ validate_json_format()
>  test_json_converter_command
>  validate_json_format
>
> -exit ${err}
> +# Set -e is on, so it was only successful if it ran up to this point.
> +# Therefore only set err=0 here.
> +err=0
> +exit
> --
> 2.34.1
>