From: Kees Cook <keescook@chromium.org> To: Will Deacon <will@kernel.org> Cc: Kees Cook <keescook@chromium.org>, Ard Biesheuvel <ardb@kernel.org>, Arvind Sankar <nivedita@alum.mit.edu>, Atish Patra <atish.patra@wdc.com>, linux-efi@vger.kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Mark Rutland <mark.rutland@arm.com>, Peter Collingbourne <pcc@google.com>, James Morse <james.morse@arm.com>, Borislav Petkov <bp@suse.de>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Russell King <linux@armlinux.org.uk>, Masahiro Yamada <masahiroy@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nathan Chancellor <natechancellor@gmail.com>, Arnd Bergmann <arnd@arndb.de>, x86@kernel.org, clang-built-linux@googlegroups.com, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.ke Subject: [PATCH v4 06/17] efi/libstub: Disable -mbranch-protection Date: Sun, 28 Jun 2020 23:18:29 -0700 [thread overview] Message-ID: <20200629061840.4065483-7-keescook@chromium.org> (raw) In-Reply-To: <20200629061840.4065483-1-keescook@chromium.org> In preparation for adding --orphan-handling=warn to more architectures, this disables -mbranch-protection, as EFI does not yet support it[1]. This was noticed due to it producing unwanted .note.gnu.property sections (prefixed with .init due to the objcopy build step). [1] https://lore.kernel.org/lkml/CAMj1kXHck12juGi=E=P4hWP_8vQhQ+-x3vBMc3TGeRWdQ-XkxQ@mail.gmail.com Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Atish Patra <atish.patra@wdc.com> Cc: linux-efi@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/firmware/efi/libstub/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 75daaf20374e..10fa342ef40c 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -18,7 +18,8 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \ # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly # disable the stackleak plugin cflags-$(CONFIG_ARM64) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ - -fpie $(DISABLE_STACKLEAK_PLUGIN) + -fpie $(DISABLE_STACKLEAK_PLUGIN) \ + $(call cc-option,-mbranch-protection=none) cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Kees Cook <keescook@chromium.org> To: Will Deacon <will@kernel.org> Cc: Kees Cook <keescook@chromium.org>, Ard Biesheuvel <ardb@kernel.org>, Arvind Sankar <nivedita@alum.mit.edu>, Atish Patra <atish.patra@wdc.com>, linux-efi@vger.kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Mark Rutland <mark.rutland@arm.com>, Peter Collingbourne <pcc@google.com>, James Morse <james.morse@arm.com>, Borislav Petkov <bp@suse.de>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Russell King <linux@armlinux.org.uk>, Masahiro Yamada <masahiroy@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nathan Chancellor <natechancellor@gmail.com>, Arnd Bergmann <arnd@arndb.de>, x86@kernel.org, clang-built-linux@googlegroups.com, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 06/17] efi/libstub: Disable -mbranch-protection Date: Sun, 28 Jun 2020 23:18:29 -0700 [thread overview] Message-ID: <20200629061840.4065483-7-keescook@chromium.org> (raw) Message-ID: <20200629061829.Q0aVIZqNjbsM3KslcUyQYKCWryiwqU2iVjaW-esglqw@z> (raw) In-Reply-To: <20200629061840.4065483-1-keescook@chromium.org> In preparation for adding --orphan-handling=warn to more architectures, this disables -mbranch-protection, as EFI does not yet support it[1]. This was noticed due to it producing unwanted .note.gnu.property sections (prefixed with .init due to the objcopy build step). [1] https://lore.kernel.org/lkml/CAMj1kXHck12juGi=E=P4hWP_8vQhQ+-x3vBMc3TGeRWdQ-XkxQ@mail.gmail.com Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Atish Patra <atish.patra@wdc.com> Cc: linux-efi@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/firmware/efi/libstub/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 75daaf20374e..10fa342ef40c 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -18,7 +18,8 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \ # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly # disable the stackleak plugin cflags-$(CONFIG_ARM64) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ - -fpie $(DISABLE_STACKLEAK_PLUGIN) + -fpie $(DISABLE_STACKLEAK_PLUGIN) \ + $(call cc-option,-mbranch-protection=none) cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base) -- 2.25.1
next prev parent reply other threads:[~2020-06-29 6:18 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-29 6:18 [PATCH v4 00/17] Warn on orphan section placement Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 01/17] vmlinux.lds.h: Add .gnu.version* to DISCARDS Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 02/17] vmlinux.lds.h: Avoid KASAN and KCSAN's unwanted sections Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 03/17] vmlinux.lds.h: Split ELF_DETAILS from STABS_DEBUG Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 04/17] vmlinux.lds.h: Add .symtab, .strtab, and .shstrtab to ELF_DETAILS Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 05/17] ctype: Work around Clang -mbranch-protection=none bug Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 8:15 ` Ard Biesheuvel 2020-06-29 8:15 ` Ard Biesheuvel 2020-06-29 14:43 ` Kees Cook 2020-06-29 14:43 ` Kees Cook 2020-06-29 15:06 ` Kees Cook 2020-06-29 15:06 ` Kees Cook 2020-06-29 15:08 ` Ard Biesheuvel 2020-06-29 15:08 ` Ard Biesheuvel 2020-06-29 15:16 ` Kees Cook 2020-06-29 15:16 ` Kees Cook 2020-06-29 18:02 ` Nick Desaulniers 2020-06-29 18:02 ` Nick Desaulniers 2020-06-29 18:37 ` Kees Cook 2020-06-29 18:37 ` Kees Cook 2020-06-29 6:18 ` Kees Cook [this message] 2020-06-29 6:18 ` [PATCH v4 06/17] efi/libstub: Disable -mbranch-protection Kees Cook 2020-06-29 6:18 ` [PATCH v4 07/17] arm64/build: Use common DISCARDS in linker script Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 08/17] arm64/mm: Remove needless section quotes Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 19:53 ` Nick Desaulniers 2020-06-29 19:53 ` Nick Desaulniers 2020-06-29 20:03 ` Joe Perches 2020-06-29 20:03 ` Joe Perches 2020-06-29 20:29 ` Nick Desaulniers 2020-06-29 20:29 ` Nick Desaulniers 2020-06-29 20:04 ` Kees Cook 2020-06-29 20:04 ` Kees Cook 2020-06-29 20:54 ` Arvind Sankar 2020-06-29 20:54 ` Arvind Sankar 2020-06-29 21:06 ` Arvind Sankar 2020-06-29 21:06 ` Arvind Sankar 2020-06-29 6:18 ` [PATCH v4 09/17] arm64/build: Remove .eh_frame* sections due to unwind tables Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 10/17] arm64/kernel: Remove needless Call Frame Information annotations Kees Cook 2020-06-29 6:18 ` [PATCH v4 11/17] arm64/build: Warn on orphan section placement Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 12/17] arm/build: Refactor linker script headers Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 13/17] arm/build: Explicitly keep .ARM.attributes sections Kees Cook 2020-06-29 6:18 ` [PATCH v4 14/17] arm/build: Warn on orphan section placement Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 15:54 ` Arvind Sankar 2020-06-29 15:54 ` Arvind Sankar 2020-06-29 18:07 ` Russell King - ARM Linux admin 2020-06-29 18:07 ` Russell King - ARM Linux admin 2020-06-29 18:15 ` Arvind Sankar 2020-06-29 18:15 ` Arvind Sankar 2020-06-29 19:03 ` Russell King - ARM Linux admin 2020-06-29 19:47 ` Nick Desaulniers 2020-06-29 19:47 ` Nick Desaulniers 2020-06-29 6:18 ` [PATCH v4 15/17] arm/boot: " Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-06-29 6:18 ` [PATCH v4 16/17] x86/build: " Kees Cook 2020-06-29 6:18 ` [PATCH v4 17/17] x86/boot: " Kees Cook 2020-06-29 6:18 ` Kees Cook 2020-08-21 16:02 ` [PATCH v4 00/17] " Will Deacon 2020-08-21 17:36 ` Kees Cook
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200629061840.4065483-7-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=ardb@kernel.org \ --cc=arnd@arndb.de \ --cc=atish.patra@wdc.com \ --cc=bp@suse.de \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=james.morse@arm.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.ke \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=masahiroy@kernel.org \ --cc=mingo@redhat.com \ --cc=natechancellor@gmail.com \ --cc=ndesaulniers@google.com \ --cc=nivedita@alum.mit.edu \ --cc=pcc@google.com \ --cc=tglx@linutronix.de \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).