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
| ||
|
Date: Mon, 23 May 2016 09:21:21 +0100 From: James Hogan <james.hogan@...tec.com> To: <linux-kernel@...r.kernel.org> CC: <x86@...nel.org>, <linux-arch@...r.kernel.org>, <linux-mips@...ux-mips.org>, Thomas Gleixner <tglx@...utronix.de>, "Ingo Molnar" <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, James Hogan <james.hogan@...tec.com>, Michal Marek <mmarek@...e.com>, Arnd Bergmann <arnd@...db.de>, Ralf Baechle <ralf@...ux-mips.org>, Paul Burton <paul.burton@...tec.com>, Florian Fainelli <f.fainelli@...il.com>, <linux-kbuild@...r.kernel.org> Subject: [PATCH v3 2/2] kbuild: Remove stale asm-generic wrappers When a header file is removed from generic-y (often accompanied by the addition of an arch specific header), the generated wrapper file will persist, and in some cases may still take precedence over the new arch header. For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended context") removed ucontext.h from generic-y in arch/mips/include/asm/, and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of the wrapper when reusing a dirty build tree resulted in build failures in arch/mips/kernel/signal.c: arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’: arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’ return &uc->uc_extcontext; ^ Fix by detecting and removing wrapper headers in generated header directories that do not correspond to a filename in generic-y, genhdr-y, or the newly introduced generated-y. Reported-by: Jacek Anaszewski <j.anaszewski@...sung.com> Reported-by: Hauke Mehrtens <hauke@...ke-m.de> Reported-by: Heinrich Schuchardt <xypron.glpk@....de> Signed-off-by: James Hogan <james.hogan@...tec.com> Acked-by: Arnd Bergmann <arnd@...db.de> Acked-by: Florian Fainelli <f.fainelli@...il.com> Cc: Michal Marek <mmarek@...e.com> Cc: Arnd Bergmann <arnd@...db.de> Cc: Ralf Baechle <ralf@...ux-mips.org> Cc: Paul Burton <paul.burton@...tec.com> Cc: Florian Fainelli <f.fainelli@...il.com> Cc: linux-kbuild@...r.kernel.org Cc: linux-arch@...r.kernel.org Cc: linux-mips@...ux-mips.org --- Changes in v3: - Ensure FORCE actually gets marked .PHONY. Changes in v2: - Rewrite a bit, drawing inspiration from Makefile.headersinst. - Exclude genhdr-y and generated-y (thanks to kbuild test robot). --- scripts/Makefile.asm-generic | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic index 045e0098e962..e4d017d53819 100644 --- a/scripts/Makefile.asm-generic +++ b/scripts/Makefile.asm-generic @@ -13,11 +13,26 @@ include scripts/Kbuild.include # Create output directory if not already present _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) +# Stale wrappers when the corresponding files are removed from generic-y +# need removing. +generated-y := $(generic-y) $(genhdr-y) $(generated-y) +all-files := $(patsubst %, $(obj)/%, $(generated-y)) +old-headers := $(wildcard $(obj)/*.h) +unwanted := $(filter-out $(all-files),$(old-headers)) + quiet_cmd_wrap = WRAP $@ cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@ -all: $(patsubst %, $(obj)/%, $(generic-y)) +quiet_cmd_remove = REMOVE $(unwanted) +cmd_remove = rm -f $(unwanted) + +all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE + $(if $(unwanted),$(call cmd,remove),) @: $(obj)/%.h: $(call cmd,wrap) + +PHONY += FORCE +.PHONY: $(PHONY) +FORCE: ; -- 2.4.10
Powered by blists - more mailing lists