Re: [PATCH v1] selftests: ktap_helpers: Fix uninitialized variable

2024-11-27 Thread Mickaël Salaün
On Wed, Nov 27, 2024 at 05:03:40PM +0100, Mickaël Salaün wrote:
> __ktap_test() may be called without the optional third argument which is
> an issue for scripts using `set -u` to detect uninitialized variables
> and potential bugs.
> 
> Fix this optional "directive" argument by either using the third
> argument or an empty string.
> 
> This was discovered while developing tests for script control execution:
> https://lore.kernel.org/r/[email protected]
> 
> Cc: Kees Cook 
> Cc: Nícolas F. R. A. Prado 
> Cc: Shuah Khan 

Please add this missing tag:

Fixes: 14571ab1ad21 ("kselftest: Add new test for detecting unprobed Devicetree 
devices")

> Signed-off-by: Mickaël Salaün 
> ---
>  tools/testing/selftests/kselftest/ktap_helpers.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/kselftest/ktap_helpers.sh 
> b/tools/testing/selftests/kselftest/ktap_helpers.sh
> index 79a125eb24c2..14e7f3ec3f84 100644
> --- a/tools/testing/selftests/kselftest/ktap_helpers.sh
> +++ b/tools/testing/selftests/kselftest/ktap_helpers.sh
> @@ -40,7 +40,7 @@ ktap_skip_all() {
>  __ktap_test() {
>   result="$1"
>   description="$2"
> - directive="$3" # optional
> + directive="${3:-}" # optional
>  
>   local directive_str=
>   [ ! -z "$directive" ] && directive_str="# $directive"
> -- 
> 2.47.1
> 
> 



[PATCH v1] selftests: ktap_helpers: Fix uninitialized variable

2024-11-27 Thread Mickaël Salaün
__ktap_test() may be called without the optional third argument which is
an issue for scripts using `set -u` to detect uninitialized variables
and potential bugs.

Fix this optional "directive" argument by either using the third
argument or an empty string.

This was discovered while developing tests for script control execution:
https://lore.kernel.org/r/[email protected]

Cc: Kees Cook 
Cc: Nícolas F. R. A. Prado 
Cc: Shuah Khan 
Signed-off-by: Mickaël Salaün 
---
 tools/testing/selftests/kselftest/ktap_helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kselftest/ktap_helpers.sh 
b/tools/testing/selftests/kselftest/ktap_helpers.sh
index 79a125eb24c2..14e7f3ec3f84 100644
--- a/tools/testing/selftests/kselftest/ktap_helpers.sh
+++ b/tools/testing/selftests/kselftest/ktap_helpers.sh
@@ -40,7 +40,7 @@ ktap_skip_all() {
 __ktap_test() {
result="$1"
description="$2"
-   directive="$3" # optional
+   directive="${3:-}" # optional
 
local directive_str=
[ ! -z "$directive" ] && directive_str="# $directive"
-- 
2.47.1