Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp1840853iol; Fri, 10 Jun 2022 16:38:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYLBNZM12lcx5k8Q+ioGZmERaT12oKgN85GLciTFcb2IFJDpppknsT1tlrSaIdpCEJ2o/q X-Received: by 2002:a17:906:7d83:b0:6ce:fee:9256 with SMTP id v3-20020a1709067d8300b006ce0fee9256mr43462502ejo.647.1654904326749; Fri, 10 Jun 2022 16:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654904326; cv=none; d=google.com; s=arc-20160816; b=vw6f8DyrDTus1Fius8q8rrdICouf+e2kTa8Q76ICjd59I7ZmTeMj2MfzM5SAN3x863 9ztFXb+nkqqKiyqDDCaaRFcgTFjQdTRstBpVY+3mZwXWSOlfVCS1zQ0uV683TpKhu5JC gDTSpFJ8ymqQHAu5YFtAaUhmadOI3rg8p+IMmVuGPULB+gaN4jBQ8Dc0B+AubPYa6852 GmzFNUzLp/w6UtSwQ3rsLfVLc9mESyU0rENV6rYrFFCDWhtjo3Tj042plkdI4nAMeaU0 gTkb52c17E7iFYDVXLNgCZ3mxvDJq3qtkuI6dZgQGFZ1D24Bh5L+O4XBE2KuF1r6zxXK xRYg== 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=eypUC8nmG3YT8q5C7uTFJ2I4wzdimzIgtd5eniK3Szg=; b=kpxH+sbgBn8AJL48pLLlHmOupcvniM/XEg6am/sQhoUlJiBonNyiRKfcKIiuE058r6 rdLXqVJ7C4cxDtMna+qdCkVs/WOvNFToQiG1ae2olLv5VXGOLUzrdCgFP6p5w2LnFnoI E6YVIrCF/PZlbv4IhhuW50nXhJaIBuMZ1mHZCsUCaBvO2BzPXClQBcQyDxbWVTjH+Ga3 LRqlmCL+xeziJkq/2Y6MVGRNvAhqERgyN65EZcBxbfUDwZzTro1ul25o8Jbi/dXY413L yT+oK3edha/TLre37oG++dePWYRpv9s9sK7n/k/U5xqhwFROgAYJIBIjxYZZN1VP+Op/ nl5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=NT94rukK; 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 m7-20020a056402430700b00425f8164d96si683663edc.9.2022.06.10.16.38.21; Fri, 10 Jun 2022 16:38:46 -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=NT94rukK; 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 S1351041AbiFJXg7 (ORCPT + 99 others); Fri, 10 Jun 2022 19:36:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350385AbiFJXgJ (ORCPT ); Fri, 10 Jun 2022 19:36: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 86E8D28DC34 for ; Fri, 10 Jun 2022 16:35:43 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id q200-20020a252ad1000000b006632baa38deso542802ybq.15 for ; Fri, 10 Jun 2022 16:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=eypUC8nmG3YT8q5C7uTFJ2I4wzdimzIgtd5eniK3Szg=; b=NT94rukK/ENqT6F0xPM3Aj1DW37YL8idTohVFW7YlP6QY7NC9NtuMIKvSSbuklXeE8 H3FRqhFXc3q9MsQZPtgnLsY8DyD6LJv9BPNASoXwJ8+0pRkqBXzTeWozo2Y8/iM3z+3z FSjZIqivcQd8gXXi90mLqnt+9zbzSocGJBB4YxcLPtXwXpY8SkqnsaVmPtckRjwn831V EDzZuqEkuiekO9OhcgWqjN5jhG9hM79osNspGRqQ4j5CKysV0QuLSzBoMIFRtsx7GtMj bANF9OiYpNqij4DFKYZh0Ocq9NRV3o5FkeP4Rosggd8ZUAy9hGzOvU5dtlsBU9cFLM5A ZgDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=eypUC8nmG3YT8q5C7uTFJ2I4wzdimzIgtd5eniK3Szg=; b=WbgfbpAYfgo5GNvwJy1ZNvrmtyf56R5i3CvpXLNR4X/P+Hg76c32Gmi5KDWmkJfW+h /dsI8exnykcOM4aQACWFgRqNFfq4Taio6a7IsxLcYxQ/NZbSNwNbry6zN36DnleERz8p ZhZ1H3TY6ME7QoLsILWCzzENcvXanMxnj+38PwkfTds5dU21XB0lB2nTrCyXZqGO/0C6 Z3is1dbPx4e8ksQWb/TrNL7De84DqSADpmNbMBbCte+r/XCWQWdVU2lJi1Wk+xr3MVFu S2Ck4kzb5VI4zP4Opa6mrggtEJbZh40sw6xM3tQegL8SB9F3ltMQM1qSJn/F8Yo1Cdu7 xnxA== X-Gm-Message-State: AOAM532oeFAWbON3avNVTJoNqxFKtZsHqs9PCAZMgxogBxhfUMWqpGEc CWSBSNODhCfEsg6zfkHhCq14I04LvH/87YyloDcDXgynBS+ZLmwgy+GLDClVdHZU3vpWIgvSirg GcpMX2nwrxaBS57/KlIkR4sauVRItctopbeMNUN4klUb6nkzrS5xU2OoRORvrtE6AONFc4uAViW iou/9NdvW0cg== X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:f464:6db6:3d47:ed14]) (user=samitolvanen job=sendgmr) by 2002:a05:6902:1209:b0:65f:fe1f:ccc5 with SMTP id s9-20020a056902120900b0065ffe1fccc5mr50987109ybu.470.1654904142601; Fri, 10 Jun 2022 16:35:42 -0700 (PDT) Date: Fri, 10 Jun 2022 16:35:04 -0700 In-Reply-To: <20220610233513.1798771-1-samitolvanen@google.com> Message-Id: <20220610233513.1798771-12-samitolvanen@google.com> Mime-Version: 1.0 References: <20220610233513.1798771-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; h=from:subject; bh=yTF7mBzTmEEqMjI8Eaby9TrzTnV5t5mkewPsQ9aMhDM=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBio9UubPFBxpUPffLvY8XGo6RcYbE+L/kncexxBV2G Tm2YZi6JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYqPVLgAKCRBMtfaEi7xW7qSmC/ 4pdjbQn0xIP+w0uxO/LVcNtQi8bbX18SxoBTEsodTMM+qtBOKgl67Hl7st0lgjrIVIJLZfKtdfrFCM AqYp5GNXQItjH7Dz4LxFQnN/xEM0/f7SQmc/aTvDUhr9dAKTLrFdWofqL/dWg5CrQtsqQxflGjA5kn qbysQ4DmUpQ74U+Ag1IYvBxskA6a9lz/U5CiKP8GFQdTLbgS84SAc3XHmcX5d/jTTSJDO+1+7i+s0J tEBxH93Rw7SA6pqbca1/a/xiYsN8Dx5NlR1C6x63HsBoMTLfmEOKYQ8y8C8YgQ3/EwQJgVxPPe8weF LjvitSkAvesDpMBt3id6LheIMVrkH5dr7yNKpMH1hwT6QltjQEmhL/bsqm0lGMyHoV7CobVJZv69dH aocun1+0o0S2ZnRAZDj0wgJ+7H+Tu7Il7konkB4CnmUg5FUHbcIDLfcj8VI3heqFhovdc0dVZhLENV BZYygkr+dc+1FXb5JFcBeRQOX7/PgclKahJNc4JlMrD8M= X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [RFC PATCH v3 11/20] 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.36.1.476.g0c4daa206d-goog