Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp4748356rwe; Tue, 30 Aug 2022 16:35:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4QZO7ygUY9uN8kdclYWEZnrbJchtHnkwtUF+0b7TKKpy1MwmWuqv7QTZb6o9mQn58w6gyM X-Received: by 2002:a17:907:c0f:b0:741:9525:23d6 with SMTP id ga15-20020a1709070c0f00b00741952523d6mr8320818ejc.277.1661902545002; Tue, 30 Aug 2022 16:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661902544; cv=none; d=google.com; s=arc-20160816; b=pmXBZb0FkJ/Dr0+JV25r3oXYOSvhWpT7XiYCQ7FYuZ35YoQbf/wsWjClPrvik9vtNl 9fvX3w+ToQDNbNAaNtujX29VESPX+pssazHQieqenwX7pKs/YeXjNWX26Z90RUodF6RP 1+ECii/oqP1gw56kJYgtteJYPC1coU/howYnYgKt3huSt+WrrGzquwWzRmnY2Rj4W9iS IkY7WK1+oXZoJoCneuLgDEZiOUwQaDW6/xFnvoxrteTi2OETR2AFkXWrWqqDGRlv31S+ PP2tvKZwliy3KdN0jlwuRywmoVUPEoOEbP2A+jc5NOjGyShMPwzvtAmcCpE4jKxdoyDc LOgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Y90TqhxNMQ3gAHq7V3hOpDRusm/1brSg9ZJSv3Zo0sc=; b=C3sBTUkwREDwsU2yTc5sI1b430rxvi8RISQFpt9gZVeZ/sbycTBbyRoepwu94+4Lzz hAe9Lsd41RXSrMZ2+nA9zSlJMPeL68tH4v5GmatZJpxdl0iNLsV4LNZlftAEyznEakzq 34j6Apv3/F//dP+G/vbpb9w6y6f9yYjgkR8C/I3QMUWAlgmGhIp24SJ33e0xdLnEIus4 R2ZNVv8imdPf1tlRiDcwMPgUtCVDkkByp9sJn0HHWdJ2UjvIlSis7TCJE61UTAxCEhP/ d3UII/rc319iQVqHjtyI/ad26NL78MOzwj5szqMqsOL1PDeQuUVqOpMq6Qha2dHfR7Tx Gmhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Blk28reI; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a1-20020aa7cf01000000b004464f14a3bfsi8855614edy.202.2022.08.30.16.35.19; Tue, 30 Aug 2022 16:35:44 -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=@google.com header.s=20210112 header.b=Blk28reI; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231777AbiH3XdM (ORCPT + 99 others); Tue, 30 Aug 2022 19:33:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232148AbiH3XcJ (ORCPT ); Tue, 30 Aug 2022 19:32:09 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECD9F7C182 for ; Tue, 30 Aug 2022 16:32:06 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 63-20020a250d42000000b00696588a0e87so870175ybn.3 for ; Tue, 30 Aug 2022 16:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date; bh=Y90TqhxNMQ3gAHq7V3hOpDRusm/1brSg9ZJSv3Zo0sc=; b=Blk28reIZWBLJmUJEULQ6cuj0seeXr4Ly6Sjc4PdA9VqIS72GbhwKOIthbX7BP3K3N tl4uHkaui0bFxUYD4FxnerwhmSOCRt/3a5W1nVSjTlFE5S9qQOnfSjeD+biC1n8T6oWx CbxEnNYofTItTkZMU/h5o8yWHwX6NcU2n8rdEECLrsQyc3xbtJG9RGHbiTbkD697AH8p 0p/VCT7qeOFCYjRLbLS2or7mI2M+S72Ny0hSJDqI1Jl/Ry3Vw2Yi8g5rHuOMRQOIZqJZ nOcvTxSxdnqYA5nfuy9wwQ1/vdS+DuiGOCwB1maldh3NXrXpJxv/SHt8HLHfTqiMuZE9 kaBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=Y90TqhxNMQ3gAHq7V3hOpDRusm/1brSg9ZJSv3Zo0sc=; b=GEloMZ06KG7kCPItDpy9EbIo1v11YH/azfMUrRTwCnj5RfLaT0ShwLSD54x1HdRq7M bKHUx8ASjuY124uK8h5AZidysoidQ6i8SnzGTrhd6mwZ/2QticvPEMUJ+9hytV7V7W+p xGUEmzwRva/4eZw+rHxpjGozAQopbCBP0Xp5gk/4VgK/9DKN0gY5DxDIjngJHlKa5kUv gUZY9wlW8jva9YdFZp6d/Rl17sidfC984svgIkXyyBlxF/N3sUqxPDR922R084+0QYTh gOQ5Yg/EYMhplGYMDAeXWD9bRfa0XudkxG+tcDYVmI1XjouWhtoH94ClOoQNYoLuVMe/ jKGQ== X-Gm-Message-State: ACgBeo2TT/EpxeuNRJMH9BUmxoxPS0lLhSVAj7HxLsVBb03EZ8B2Wgv2 xP05zeFXnmRMY2yi9Ce6VRFFreql4E4JewKiuWgNAkDhdxef3UIY1LIVOrn3+n7D70GocxeMHVk 6V6DOD8s0bs+DQSJ1XTmtuAdmhUapfAPin6/LILGU6NUayJwLOSoVq36BRCYZgVoW+DwZyO3vTp mVi8dNGYEx0w== X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:54d9:7143:6a7d:91d]) (user=samitolvanen job=sendgmr) by 2002:a0d:ea90:0:b0:33d:faad:db54 with SMTP id t138-20020a0dea90000000b0033dfaaddb54mr15764471ywe.116.1661902325870; Tue, 30 Aug 2022 16:32:05 -0700 (PDT) Date: Tue, 30 Aug 2022 16:31:20 -0700 In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> Message-Id: <20220830233129.30610-13-samitolvanen@google.com> Mime-Version: 1.0 References: <20220830233129.30610-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=933; i=samitolvanen@google.com; h=from:subject; bh=gYeKGrEmE8r8WUfed/9NfQZCcqJiKdZ5mJNzlRspFgQ=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBjDp3NYIHeCmDy6N75o9wbFM1SaM7q6xMhl1ek5nmf tKwFtwSJAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYw6dzQAKCRBMtfaEi7xW7mfMDA CCrJQjwANsScQKI2BY9zkAwahvmB7CoktFhlZo5wdeIVcUhYVU37TOPEGsDCHGkMEcnh3utamgs/Y/ T6ipy6/m+pUxo/fJ2ZNU2wTtK7Gjm1EirsF7INven2B4n24G9e/aUw/L/0mAyY0pTXMAZXUuWM5XTI EDoGM/Jc8rxyuDuxxSvM1eX9ScZu2/qTH3Pre8WBN80Qwoq2pdOGgSlZYiGpe+OrKSjWFrO8rXwKIG fnEAva4AWwQlzR0bfLWO+yuUpVyA8T1YoPNa1ZWYIMmSvyi4ntpMkBcCloJvnE8hUo6vmXmhYad4+v S9SWJgQX5wn8D1h6+3oniyHgD9AZe19ip2/ywyg/UiOGm086JGI0e/uTS21tWyJNyrUP6Tx//6lmV8 enTLqz1/8araIWIF9mbmw+PUv21yPZ7DZQf0/LGoaJSmORa06SCfBeADR7lea9HyT4TCOWkdvGiGi/ N53Qy4QGRFuv2zZNiAmohrX8NP0ScQePKcN06eX01dGBs= X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Subject: [PATCH v4 12/21] init: Drop __nocfi from __init From: Sami Tolvanen To: linux-kernel@vger.kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Nick Desaulniers , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 It's no longer necessary to disable CFI checking for all __init functions. Drop the __nocfi attribute from __init. Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook --- include/linux/init.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/init.h b/include/linux/init.h index baf0b29a7010..88f2964097f5 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -47,7 +47,7 @@ /* These are for everybody (although not all archs will actually discard it in modules) */ -#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline __nocfi +#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline #define __initdata __section(".init.data") #define __initconst __section(".init.rodata") #define __exitdata __section(".exit.data") -- 2.37.2.672.g94769d06f0-goog