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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 8729DC433E1 for ; Mon, 29 Jun 2020 19:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A55620702 for ; Mon, 29 Jun 2020 19:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FcI9HcFN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733186AbgF2Tcq (ORCPT ); Mon, 29 Jun 2020 15:32:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733220AbgF2Tco (ORCPT ); Mon, 29 Jun 2020 15:32:44 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D419EC02F005 for ; Mon, 29 Jun 2020 07:43:38 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id q90so7352158pjh.3 for ; Mon, 29 Jun 2020 07:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Yi6JXAo1ZyKdvYW2lysqRB4X8J5GEgjfQlw9nhW0Ebg=; b=FcI9HcFNnmkS7xOHrCLlNWmbbi80f8MLjkp0bTXWTdF+IBlRUCurEMLoVIR7Yt57B0 mhPSrFkFF78lCAtSinaJ6aJX97k5zhtcFaxInJWiI7oACyaPmRvWRoa5/N4zzTpu+TPl VXPrT6yEUnDqZ0d1u9easG3Ru3Qjw96EneDF4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Yi6JXAo1ZyKdvYW2lysqRB4X8J5GEgjfQlw9nhW0Ebg=; b=QRlrxsBoO1JPMTY4fAy3GsjLWmxoL8kLvZaEdAUi+8XXd8Adn9RIRw36k1N7FQGWd7 M8a2bPt4ulIfpL/XhjSo9lIIT04Q+boLFz08Vr8zAhko0AuvvAy6CWUadjqAohZ+8cFs 0zZU6aT5b2DODQ2VkB81O5B0ai7kFhafDbjD+9xtC1aDiD6G0HD5hIS/t3yr3chId+rF Ftx7Z9ENsSyZjwIU0NzwZWesbtCEezoAUDuZbiVaQ8IWMn2SwJCiB3hLrycnBMYN5gk8 aWCfj+gVXLlyHJjev2MvMoJtGgLT7OYN6Tbfzv6O65k6U/dX0EinLn7ai9cR02QgR8gJ O6HA== X-Gm-Message-State: AOAM533gewVdtEpP57twh+EN+25AuzJoTap6xemi74PDnDykgUqYv7h5 HcKQIU3WRxriiuFyOfVmoX7jfg== X-Google-Smtp-Source: ABdhPJwybf+0t6W88LuU35gXB6jzrCSMoNi9aseWcKSgTK9Lcgit7BB1R8CrmUhMywtQcxnrnSW8RQ== X-Received: by 2002:a17:902:9346:: with SMTP id g6mr13542327plp.19.1593441818365; Mon, 29 Jun 2020 07:43:38 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id 25sm58832pfi.7.2020.06.29.07.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 07:43:37 -0700 (PDT) Date: Mon, 29 Jun 2020 07:43:36 -0700 From: Kees Cook To: Ard Biesheuvel Cc: Will Deacon , Dave Martin , clang-built-linux , Catalin Marinas , Mark Rutland , Peter Collingbourne , James Morse , Borislav Petkov , Thomas Gleixner , Ingo Molnar , Russell King , Masahiro Yamada , Arvind Sankar , Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , X86 ML , linux-arch , linux-efi , Linux ARM , Linux Kernel Mailing List Subject: Re: [PATCH v4 05/17] ctype: Work around Clang -mbranch-protection=none bug Message-ID: <202006290742.92EC7235@keescook> References: <20200629061840.4065483-1-keescook@chromium.org> <20200629061840.4065483-6-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org 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? Correct. > 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. Okay, will revert to the v3 solution. -- Kees Cook