From patchwork Mon Oct 24 11:27:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9411 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478554wru; Mon, 24 Oct 2022 07:17:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4+S+3eeFg7oF2fXenVC4Ffmvz3LPF7DbqQcXZAoVelXswI4Swdcdt0Qygtqgyaavz0q+B0 X-Received: by 2002:a17:907:2d91:b0:78d:8747:71b4 with SMTP id gt17-20020a1709072d9100b0078d874771b4mr27875162ejc.545.1666621053008; Mon, 24 Oct 2022 07:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621053; cv=none; d=google.com; s=arc-20160816; b=YvfhESVGcZBWw50G8JmCZel0iXbl5XPYtVvy1sqoaQwIJ70pvii/bv/6zmV4VTYw/r AXIzB3K2qCxxsOwMjoBgGmVB54sy69E/m8m+b8cHFIqnVBXp6sczyfmhnaxFWKadDm+P ZMoTMi+tF8g5lPyQzgWXdvf5UzPhaOZRjYLmVQWN17/HYzusPaOjzIHeppe63Swueaho Kirr7K7y75BZap5zOgBHZfsmWLUNVXTM9Mgw3ASEhQM9RzYHubzYPT3wOSoq2KHlxChC M8kIc30bwe8jk3VyFhul/trhyAY9VBPVvcP/CMQtRx8Qz9xXsfRp3LzgtXXTmI41q+6+ eIog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w1iLrhPmmSu9rlY1ynC5y49b5nPbM3zPpx469WXwyjQ=; b=dMSYfhosdcbFGqKn7+8x/nrnXtOuKVWh+m6SmgRJggs8mv0m4VYrq38z5vgd05jZ/c qt7ggsusuPMu/orrN2l5kcRI8AkizcvwnVyZTkJLH88HJFKUcFi1lNbyxqACtqwFV7wT HHwqwiT9DaZNoi6CwsDaiMgCt8tg7fqz9b4eLycVnvBH311VGsObypWWdlV5otKxWmF2 nxmdzFwNzfVWhbU/uSLc/LCKu8ng+xOA+jPdzP8/dARGZ+y4kgE6JRW6EU0bzf9WQgJW 2gJwmzBFSEZgOB7UUEegoHcNTP1slEz8gpwxQmKNu3scbRuFaaqBDNL2Zm/KB4Cwzf5B cegA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mk+3F1y4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f8-20020a170906048800b007878c9d73a2si22124605eja.426.2022.10.24.07.17.08; Mon, 24 Oct 2022 07:17:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mk+3F1y4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232458AbiJXOIm (ORCPT + 99 others); Mon, 24 Oct 2022 10:08:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237205AbiJXOFB (ORCPT ); Mon, 24 Oct 2022 10:05:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5D722BCD; Mon, 24 Oct 2022 05:49:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8B855B81889; Mon, 24 Oct 2022 12:36:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDF79C4314E; Mon, 24 Oct 2022 12:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615010; bh=hPttMeNMtPjB3kXYpF6XGTSl4eSIr1TUfrKRMoITllI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mk+3F1y4BQ7Dr+7KElw7CQcznKxuKoWUIte0S+X3492R6MLxQ0WLjbcdErdwMBYvn ZNTV20KF58477I/QK34mRPJ8nlySe3mIYZ803srRvqroBUqcMggd4xaljXkyS0ViFm k2SPKsYc3QQfN5P6K94n06lt8FxBIzPpMOFXcuhI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , Masahiro Yamada , Nick Desaulniers , linux-kbuild@vger.kernel.org, llvm@lists.linux.dev, Kees Cook Subject: [PATCH 5.15 087/530] hardening: Remove Clangs enable flag for -ftrivial-auto-var-init=zero Date: Mon, 24 Oct 2022 13:27:11 +0200 Message-Id: <20221024113048.944971980@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747578837445161285?= X-GMAIL-MSGID: =?utf-8?q?1747578837445161285?= From: Kees Cook commit 607e57c6c62c00965ae276902c166834ce73014a upstream. Now that Clang's -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang option is no longer required, remove it from the command line. Clang 16 and later will warn when it is used, which will cause Kconfig to think it can't use -ftrivial-auto-var-init=zero at all. Check for whether it is required and only use it when so. Cc: Nathan Chancellor Cc: Masahiro Yamada Cc: Nick Desaulniers Cc: linux-kbuild@vger.kernel.org Cc: llvm@lists.linux.dev Cc: stable@vger.kernel.org Fixes: f02003c860d9 ("hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO") Signed-off-by: Kees Cook Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- Makefile | 4 ++-- security/Kconfig.hardening | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) --- a/Makefile +++ b/Makefile @@ -845,8 +845,8 @@ endif # Initialize all stack variables with a zero value. ifdef CONFIG_INIT_STACK_ALL_ZERO KBUILD_CFLAGS += -ftrivial-auto-var-init=zero -ifdef CONFIG_CC_IS_CLANG -# https://bugs.llvm.org/show_bug.cgi?id=45497 +ifdef CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER +# https://github.com/llvm/llvm-project/issues/44842 KBUILD_CFLAGS += -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang endif endif --- a/security/Kconfig.hardening +++ b/security/Kconfig.hardening @@ -22,11 +22,17 @@ menu "Memory initialization" config CC_HAS_AUTO_VAR_INIT_PATTERN def_bool $(cc-option,-ftrivial-auto-var-init=pattern) -config CC_HAS_AUTO_VAR_INIT_ZERO - # GCC ignores the -enable flag, so we can test for the feature with - # a single invocation using the flag, but drop it as appropriate in - # the Makefile, depending on the presence of Clang. +config CC_HAS_AUTO_VAR_INIT_ZERO_BARE + def_bool $(cc-option,-ftrivial-auto-var-init=zero) + +config CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER + # Clang 16 and later warn about using the -enable flag, but it + # is required before then. def_bool $(cc-option,-ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang) + depends on !CC_HAS_AUTO_VAR_INIT_ZERO_BARE + +config CC_HAS_AUTO_VAR_INIT_ZERO + def_bool CC_HAS_AUTO_VAR_INIT_ZERO_BARE || CC_HAS_AUTO_VAR_INIT_ZERO_ENABLER choice prompt "Initialize kernel stack variables at function entry"