From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C19D8C433DF for ; Mon, 29 Jun 2020 18:04:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8ADF5255CA for ; Mon, 29 Jun 2020 18:04:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ahV6zDad"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="r13LcPYk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8ADF5255CA Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=db4LKl7iD8rLQUf1TofDNv0LYPyRxJHvvVLSKNNXnPI=; b=ahV6zDadZ4lpQg906Buc3cGug 8Ihi1rPMXDCBQL+S4HVno+X7w0dycwSWi8cNplUGMwpBmDyMdVo//siEAvO7X++DrjIU7zfaO473Z HQ7BnkdQzicrdfXozrDM/0uP7rokhLsuk4BbHtyWsEEELYn/C6BKwpyo/ecOnlz7+d/WFPWCckUJv 7fPFValUYfSVPgcr4bFDeo5NeMr5Q6zmkF0cvGd76nF7A7ws8HrhNtGfRx3LkxbN5XJKGAvSWkAAP x6snVS+TpVbo9uzL6W9P1e1F2lXCIqpn+A6cWUcLl6qjUjMBKKfuQO9zyHfAAlqRtmvyQHSTW5cJM icMasj5Cw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpy7a-0006JY-97; Mon, 29 Jun 2020 18:03:10 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpy7W-0006J5-MK for linux-arm-kernel@lists.infradead.org; Mon, 29 Jun 2020 18:03:07 +0000 Received: by mail-pf1-x442.google.com with SMTP id a127so8204278pfa.12 for ; Mon, 29 Jun 2020 11:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jcOa7nLCMvwvBvn+lXefiaEhY1cnw7datfi9VffahTk=; b=r13LcPYkVT0QvwJZmwPVtSiSE821D8z+loelig4JyhWpIr2GDIKdMpwQEoIwTQy2oH TmbsgQgAdaNwDNSMupvVB0Q5lBpVn0GlcrJ/QltbLA7O4hd371LAsV7U/bNWwKh3fjjJ Emnx6ima91VS1Q/Coc13JQiR6B7PeqtzMdSDveDWWXo/TbrU5lZ5CmGyIrdrbcZWayMf y5tlvmSbbV4sJ7OYjoxYDJRYvf+h2fgbUczNYJDoheq4vWjGcQK+JZouEgO6tEIKjP0J qf5p0fOOrT1TcBV7dXPpqhhkYuiuUNN8qlWdn2JY+3bmJ/GIeRZAVv+AqO4ojiijs4Uj JfJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jcOa7nLCMvwvBvn+lXefiaEhY1cnw7datfi9VffahTk=; b=V36cNK1Yga+9rbGEofkmcqpBNMqlJZwtpCqYRzLlM9Lftg2vqLv/uqwsrUilcclt2p eV/rtQk//mjFh93iH+Y2dBwrGyn2PxkHbd8dMSKw3uJAw0//iSGhPQGp60mmoY11fHVT 6Zzv+r7o7ZqYBsKVlzX1aKpf6FAA7xSavkpoxkowmkX7A67zbMYI9zGOcBgnon/8+y0U Nhp4xC98QCKB7yzGd0oKgdPeG0XlsdCsUzOfyZslRVrf3Ga4d1rKNtTNpN4mKIwfZinq g+3oldh/qRu2yT5eoG0Giz5ormY9S5+S4ipRzZvPiwLce3Q+YMIc5vfJPJMBT+x/T+El TsJA== X-Gm-Message-State: AOAM5319uQs1JQYE22TqKAaMXu+mt0Z/BwhUNDRaYxRbcAJzbTxKKJCH BcvFCdMQKjhuAfP8+deECgxHwYzAICv9ZlYMF5TF9Q== X-Google-Smtp-Source: ABdhPJz9+i4D45iNpvDJAjy8t0TCOs03y2uc7EK1ApuKtEPPpmNHtDv8UmtRzYb/Tg4Esq7LtMnkj4tJsm1tUYBKEnc= X-Received: by 2002:a05:6a00:15ca:: with SMTP id o10mr15661788pfu.169.1593453782335; Mon, 29 Jun 2020 11:03:02 -0700 (PDT) MIME-Version: 1.0 References: <20200629061840.4065483-1-keescook@chromium.org> <20200629061840.4065483-6-keescook@chromium.org> <202006290806.3BDE2A8@keescook> In-Reply-To: <202006290806.3BDE2A8@keescook> From: Nick Desaulniers Date: Mon, 29 Jun 2020 11:02:51 -0700 Message-ID: Subject: Re: [PATCH v4 05/17] ctype: Work around Clang -mbranch-protection=none bug To: Kees Cook X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , linux-efi , Catalin Marinas , Arvind Sankar , Will Deacon , Thomas Gleixner , Daniel Kiss , linux-arch , Masahiro Yamada , X86 ML , Russell King , Ard Biesheuvel , clang-built-linux , Ingo Molnar , Borislav Petkov , Dave Martin , Arnd Bergmann , Nathan Chancellor , Peter Collingbourne , Linux ARM , Linux Kernel Mailing List , James Morse Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jun 29, 2020 at 8:06 AM Kees Cook wrote: > > On Mon, Jun 29, 2020 at 10:15:47AM +0200, Ard Biesheuvel wrote: > > On Mon, 29 Jun 2020 at 08:18, Kees Cook wrote: > > > > > > In preparation for building efi/libstub with -mbranch-protection=none > > > (EFI does not support branch protection features[1]), add no-op code > > > to work around a Clang bug that emits an unwanted .note.gnu.property > > > section for object files without code[2]. > > > > > > [1] https://lore.kernel.org/lkml/CAMj1kXHck12juGi=E=P4hWP_8vQhQ+-x3vBMc3TGeRWdQ-XkxQ@mail.gmail.com > > > [2] https://bugs.llvm.org/show_bug.cgi?id=46480 > > > > > > Cc: Ard Biesheuvel > > > Cc: Will Deacon > > > Cc: Dave Martin > > > Cc: clang-built-linux@googlegroups.com > > > Signed-off-by: Kees Cook > > > --- > > > lib/ctype.c | 10 ++++++++++ > > > 1 file changed, 10 insertions(+) > > > > > > diff --git a/lib/ctype.c b/lib/ctype.c > > > index c819fe269eb2..21245ed57d90 100644 > > > --- a/lib/ctype.c > > > +++ b/lib/ctype.c > > > @@ -36,3 +36,13 @@ _L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L, /* 224-239 */ > > > _L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ > > > > > > EXPORT_SYMBOL(_ctype); > > > + > > > +/* > > > + * Clang will generate .note.gnu.property sections for object files > > > + * without code, even in the presence of -mbranch-protection=none. > > > + * To work around this, define an unused static function. > > > + * https://bugs.llvm.org/show_bug.cgi?id=46480 > > > + */ > > > +#ifdef CONFIG_CC_IS_CLANG > > > +void __maybe_unused __clang_needs_code_here(void) { } > > > +#endif > > > -- > > > 2.25.1 > > > > > > > I take it we don't need this horrible hack if we build the EFI stub > > with branch protections and filter out the .note.gnu.property section > > explicitly? > > > > Sorry to backpedal, but that is probably a better approach after all, > > given that the instructions don't hurt, and we will hopefully be able > > to arm them once UEFI (as well as PE/COFF) gets around to describing > > this in a way that both the firmware and the OS can consume. > > How does this look? > > > commit 051ef0b75a386c3fe2f216d16246468147a48c5b > Author: Kees Cook > Date: Tue Jun 23 18:02:56 2020 -0700 > > efi/libstub: Disable -mbranch-protection > > In preparation for adding --orphan-handling=warn to more architectures, > disable -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). > > However, we must also work around a bug in Clang where the section is > still emitted for code-less object files[2], so also remove the section > during the objcopy. > > [1] https://lore.kernel.org/lkml/CAMj1kXHck12juGi=E=P4hWP_8vQhQ+-x3vBMc3TGeRWdQ-XkxQ@mail.gmail.com > [2] https://bugs.llvm.org/show_bug.cgi?id=46480 > > Cc: Ard Biesheuvel > Cc: Arvind Sankar > Cc: Atish Patra > Cc: linux-efi@vger.kernel.org > Signed-off-by: Kees Cook > > diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile > index 75daaf20374e..f9f1922f8f28 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) > @@ -66,6 +67,12 @@ lib-$(CONFIG_X86) += x86-stub.o > CFLAGS_arm32-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) > CFLAGS_arm64-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) > > +# Even when -mbranch-protection=none is set, Clang will generate a > +# .note.gnu.property for code-less object files (like lib/ctype.c), > +# so work around this by explicitly removing the unwanted section. > +# https://bugs.llvm.org/show_bug.cgi?id=46480 > +STUBCOPY_FLAGS-y += --remove-section=.note.gnu.property This is definitely better than the empty function. Though a patch is posted for fixing this in LLVM. Assuming that lands before this, we might not actually need this workaround? arch/arm64/Kconfig 1625 config ARM64_BTI_KERNEL ... 1633 # https://reviews.llvm.org/rGb8ae3fdfa579dbf366b1bb1cbfdbf8c51db7fa55 1634 depends on !CC_IS_CLANG || CLANG_VERSION >= 100001 So if Daniel's patch lands AND is backported into the clang 10.0.1 release, then we might not need to carry this workaround? Either way, Reviewed-by: Nick Desaulniers > + > # > # For x86, bootloaders like systemd-boot or grub-efi do not zero-initialize the > # .bss section, so the .bss section of the EFI stub needs to be included in the > > -- > Kees Cook -- Thanks, ~Nick Desaulniers _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel