[PATCH 0/2] fortify: test_fortify.sh: Improve handling of tempfile

[PATCH 0/2] fortify: test_fortify.sh: Improve handling of tempfile

[Nicolas Schier]

WangYuli reported [1] that the temporary file created by test_fortify.sh
is recognised by git as untracked file, especially if it remains after
non-common exits of test_fortify.sh (e.g. killed by signal).

The following two patches handle that by renaming the temporary file and
by cleaning up the file in more situations.

Link: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/ # [1]
Signed-off-by: Nicolas Schier <nsc@kernel.org>
---
Nicolas Schier (2):
      fortify: Rename temporary file to match ignore pattern
      fortify: Cleanup temp file also on non-successful exit

 lib/test_fortify/test_fortify.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
base-commit: 3a8660878839faadb4f1a6dd72c3179c1df56787
change-id: 20251128-fortify-improve-handling-of-tempfile-2d2ac64ba4aa

Best regards,
-- 
Nicolas

[PATCH 1/2] fortify: Rename temporary file to match ignore pattern

[Nicolas Schier]

From: Nicolas Schier <nicolas.schier@linux.dev>

test_fortify.sh uses a temporary file that might appear as untracked
file in some rare sitations.  Rename it to match one of top-level's
gitignore patterns.

Reported-by: WangYuli <wangyuli@aosc.io>
Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
Signed-off-by: Nicolas Schier <n.schier@avm.de>
---
 lib/test_fortify/test_fortify.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
index c2688ab8281d..368d07d9acbf 100644
--- a/lib/test_fortify/test_fortify.sh
+++ b/lib/test_fortify/test_fortify.sh
@@ -17,7 +17,7 @@ WANT="__${FILE%%-*}"
 # Argument 2: Where to write the build log.
 OUT="$1"
 shift
-TMP="${OUT}.tmp"
+TMP="${OUT%/*}/.${OUT##*/}.tmp"
 
 # Argument 3: Path to "nm" tool.
 NM="$1"

-- 
2.51.0

Re: [PATCH 1/2] fortify: Rename temporary file to match ignore pattern

[WangYuli]

On 2025/11/29 03:27, Nicolas Schier wrote:

> From: Nicolas Schier <nicolas.schier@linux.dev>
>
> test_fortify.sh uses a temporary file that might appear as untracked
> file in some rare sitations.  Rename it to match one of top-level's
> gitignore patterns.
>
> Reported-by: WangYuli <wangyuli@aosc.io>
> Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
> Signed-off-by: Nicolas Schier <n.schier@avm.de>
> ---
>   lib/test_fortify/test_fortify.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
> index c2688ab8281d..368d07d9acbf 100644
> --- a/lib/test_fortify/test_fortify.sh
> +++ b/lib/test_fortify/test_fortify.sh
> @@ -17,7 +17,7 @@ WANT="__${FILE%%-*}"
>   # Argument 2: Where to write the build log.
>   OUT="$1"
>   shift
> -TMP="${OUT}.tmp"
> +TMP="${OUT%/*}/.${OUT##*/}.tmp"
>   
>   # Argument 3: Path to "nm" tool.
>   NM="$1"
>

Reviewed-by: WangYuli <wangyuli@aosc.io>

Thans,

--

WangYuli

Re: [PATCH 1/2] fortify: Rename temporary file to match ignore pattern

[Nathan Chancellor]

On Fri, Nov 28, 2025 at 08:27:57PM +0100, Nicolas Schier wrote:
> From: Nicolas Schier <nicolas.schier@linux.dev>
> 
> test_fortify.sh uses a temporary file that might appear as untracked
> file in some rare sitations.  Rename it to match one of top-level's
> gitignore patterns.
> 
> Reported-by: WangYuli <wangyuli@aosc.io>
> Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
> Signed-off-by: Nicolas Schier <n.schier@avm.de>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

Not a big problem but some tools might complain about the email mismatch
between the From: line (which will end up being the author) and the
Signed-off-by line.

> ---
>  lib/test_fortify/test_fortify.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
> index c2688ab8281d..368d07d9acbf 100644
> --- a/lib/test_fortify/test_fortify.sh
> +++ b/lib/test_fortify/test_fortify.sh
> @@ -17,7 +17,7 @@ WANT="__${FILE%%-*}"
>  # Argument 2: Where to write the build log.
>  OUT="$1"
>  shift
> -TMP="${OUT}.tmp"
> +TMP="${OUT%/*}/.${OUT##*/}.tmp"
>  
>  # Argument 3: Path to "nm" tool.
>  NM="$1"
> 
> -- 
> 2.51.0
> 

[PATCH 2/2] fortify: Cleanup temp file also on non-successful exit

[Nicolas Schier]

From: Nicolas Schier <nicolas.schier@linux.dev>

Ensure cleanup of test_fortify.sh's temporary file also on script
interruption, or some common signals.

Reported-by: WangYuli <wangyuli@aosc.io>
Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
Signed-off-by: Nicolas Schier <n.schier@avm.de>
---
 lib/test_fortify/test_fortify.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
index 368d07d9acbf..ad6dd44fa31c 100644
--- a/lib/test_fortify/test_fortify.sh
+++ b/lib/test_fortify/test_fortify.sh
@@ -29,7 +29,7 @@ shift
 __cleanup() {
 	rm -f "$TMP"
 }
-trap __cleanup EXIT
+trap __cleanup EXIT HUP INT QUIT TERM
 
 # Function names in warnings are wrapped in backticks under UTF-8 locales.
 # Run the commands with LANG=C so that grep output will not change.

-- 
2.51.0

Re: [PATCH 2/2] fortify: Cleanup temp file also on non-successful exit

[WangYuli]

On 2025/11/29 03:27, Nicolas Schier wrote:

> From: Nicolas Schier <nicolas.schier@linux.dev>
>
> Ensure cleanup of test_fortify.sh's temporary file also on script
> interruption, or some common signals.
>
> Reported-by: WangYuli <wangyuli@aosc.io>
> Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
> Signed-off-by: Nicolas Schier <n.schier@avm.de>
> ---
>   lib/test_fortify/test_fortify.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
> index 368d07d9acbf..ad6dd44fa31c 100644
> --- a/lib/test_fortify/test_fortify.sh
> +++ b/lib/test_fortify/test_fortify.sh
> @@ -29,7 +29,7 @@ shift
>   __cleanup() {
>   	rm -f "$TMP"
>   }
> -trap __cleanup EXIT
> +trap __cleanup EXIT HUP INT QUIT TERM
>   
>   # Function names in warnings are wrapped in backticks under UTF-8 locales.
>   # Run the commands with LANG=C so that grep output will not change.
>

Reviewed-by: WangYuli <wangyuli@aosc.io>

Thans,

--

WangYuli

Re: [PATCH 2/2] fortify: Cleanup temp file also on non-successful exit

[Nathan Chancellor]

On Fri, Nov 28, 2025 at 08:27:58PM +0100, Nicolas Schier wrote:
> From: Nicolas Schier <nicolas.schier@linux.dev>
> 
> Ensure cleanup of test_fortify.sh's temporary file also on script
> interruption, or some common signals.
> 
> Reported-by: WangYuli <wangyuli@aosc.io>
> Closes: https://lore.kernel.org/linux-kbuild/20251112114725.287349-1-wangyuli@aosc.io/
> Signed-off-by: Nicolas Schier <n.schier@avm.de>

I guess with patch 1, this does not become as big of a deal. Kees, is
there any reason to leave these temporary files around if there was an
interruption or other signal? I do not see any obvious ones so:

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  lib/test_fortify/test_fortify.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/test_fortify/test_fortify.sh b/lib/test_fortify/test_fortify.sh
> index 368d07d9acbf..ad6dd44fa31c 100644
> --- a/lib/test_fortify/test_fortify.sh
> +++ b/lib/test_fortify/test_fortify.sh
> @@ -29,7 +29,7 @@ shift
>  __cleanup() {
>  	rm -f "$TMP"
>  }
> -trap __cleanup EXIT
> +trap __cleanup EXIT HUP INT QUIT TERM
>  
>  # Function names in warnings are wrapped in backticks under UTF-8 locales.
>  # Run the commands with LANG=C so that grep output will not change.
> 
> -- 
> 2.51.0
>