linux-hardening - [RFC PATCH 04/11] kbuild: don't execute .ko recipe in --dry-run mode

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]

Message-Id: <20240819160309.2218114-5-vegard.nossum@oracle.com>
Date: Mon, 19 Aug 2024 18:03:01 +0200
From: Vegard Nossum <vegard.nossum@...cle.com>
To: Masahiro Yamada <masahiroy@...nel.org>, linux-kbuild@...r.kernel.org
Cc: Nathan Chancellor <nathan@...nel.org>, Nicolas Schier <nicolas@...sle.eu>,
        Michael Ellerman <mpe@...erman.id.au>,
        Morten Linderud <morten@...derud.pw>,
        Haelwenn Monnier <contact@...odan.eu>, Jann Horn <jannh@...gle.com>,
        Kees Cook <kees@...nel.org>,
        James Bottomley <James.Bottomley@...senPartnership.com>,
        Theodore Ts'o <tytso@....edu>, linux-hardening@...r.kernel.org,
        Vegard Nossum <vegard.nossum@...cle.com>,
        Andrii Nakryiko <andrii@...nel.org>,
        Alexei Starovoitov <ast@...nel.org>
Subject: [RFC PATCH 04/11] kbuild: don't execute .ko recipe in --dry-run mode

Prefixing a line in a make recipe with + makes that command execute even
in --dry-run mode. We don't need that here; remove it.

Fixes: 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it")
Cc: Andrii Nakryiko <andrii@...nel.org>
Cc: Alexei Starovoitov <ast@...nel.org>
Signed-off-by: Vegard Nossum <vegard.nossum@...cle.com>
---
 scripts/Makefile.modfinal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal
index 696888f0a0bde..2679304f158ad 100644
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@ -60,9 +60,9 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check),      \
 
 # Re-generate module BTFs if either module's .ko or vmlinux changed
 %.ko: %.o %.mod.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE
-	+$(call if_changed_except,ld_ko_o,vmlinux)
+	$(call if_changed_except,ld_ko_o,vmlinux)
 ifdef CONFIG_DEBUG_INFO_BTF_MODULES
-	+$(if $(newer-prereqs),$(call cmd,btf_ko))
+	$(if $(newer-prereqs),$(call cmd,btf_ko))
 endif
 
 targets += $(modules:%.o=%.ko) $(modules:%.o=%.mod.o)
-- 
2.34.1