[PATCH] tools/bootconfig: fix single & used for logical condition

Antonio Alvarez Feijoo posted 1 patch 2 years, 8 months ago
tools/bootconfig/scripts/ftrace2bconf.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] tools/bootconfig: fix single & used for logical condition
Posted by Antonio Alvarez Feijoo 2 years, 8 months ago
A single & will create a background process and return true, so the grep
command will run even if the file checked in the first condition does not
exist.

Signed-off-by: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
---
 tools/bootconfig/scripts/ftrace2bconf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
index 6183b36c6846..1603801cf126 100755
--- a/tools/bootconfig/scripts/ftrace2bconf.sh
+++ b/tools/bootconfig/scripts/ftrace2bconf.sh
@@ -93,7 +93,7 @@ referred_vars() {
 }
 
 event_is_enabled() { # enable-file
-	test -f $1 & grep -q "1" $1
+	test -f $1 && grep -q "1" $1
 }
 
 per_event_options() { # event-dir
-- 
2.35.3
Re: [PATCH] tools/bootconfig: fix single & used for logical condition
Posted by Masami Hiramatsu (Google) 2 years, 7 months ago
On Thu, 12 Jan 2023 12:42:15 +0100
Antonio Alvarez Feijoo <antonio.feijoo@suse.com> wrote:

> A single & will create a background process and return true, so the grep
> command will run even if the file checked in the first condition does not
> exist.
> 

Good catch!

Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thank you!

> Signed-off-by: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
> ---
>  tools/bootconfig/scripts/ftrace2bconf.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
> index 6183b36c6846..1603801cf126 100755
> --- a/tools/bootconfig/scripts/ftrace2bconf.sh
> +++ b/tools/bootconfig/scripts/ftrace2bconf.sh
> @@ -93,7 +93,7 @@ referred_vars() {
>  }
>  
>  event_is_enabled() { # enable-file
> -	test -f $1 & grep -q "1" $1
> +	test -f $1 && grep -q "1" $1
>  }
>  
>  per_event_options() { # event-dir
> -- 
> 2.35.3
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>