Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp243946iob; Mon, 2 May 2022 18:19:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpdTeLJd7yMguD8rUKLPB0IDsTfD2FgDBqsl/FOg57A3eZ6mxV/zEPA6fslkLJyXr3aHL7 X-Received: by 2002:a17:902:a5c4:b0:15d:4ca:90cf with SMTP id t4-20020a170902a5c400b0015d04ca90cfmr14279858plq.133.1651540769934; Mon, 02 May 2022 18:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651540769; cv=none; d=google.com; s=arc-20160816; b=Fo9e2qEfWEqVWB1Qrp5iGj4dfWPPKpBIfm99LOGEDYU9zFr2nJX6w8qnV2JR+xpBfd Ttq7CwcWuPrNOXI3oh/mjcsS5aGDZtd4tw8hK9jSu6UaU/uZAH4Prmkx1AAmB+ZFK0Ug iM5S8F1sa1UFKMazVCP8MvcRLm6U4/wUcgWpTFId54IUuhGrgd2QPPMSC9sNAoGr1tMR KhCfXNPedlCOjbOa16zBnWe3gFx6CZjH5pJAZLKwq6uXVKVChKL4mdEdJmE4SSBvQv/y oHeKjCaX/9h+oiyOQ0wPtd2MiQxfAFWKdDCgyIWAifKEn/X1otoSu3/v97JWTVtgTA0l MzIw== 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=dAD7TU5bxFw4+mtb6XZpH6YJckvLCjHt6y7FOMRwG5M=; b=rsIN6aOqUKtDC3zNMWMtpX+iK1vZ9vB6QYzSL49SonOTpAHo5LJUqv8KmnkYB7gzA0 sG9AkSMBY4ND+9MRSf/xm2/Rk2mhP6/xxvaDzZgz3lgBIAwUnnSgIwv4G/CCQREUYpCW fCfYRHa/sJ+f53yLzLPgx8suhOlrpiAK0r9+iQ34g2P81SC2PzJMZ89JCbS+aQPvZV7v YqeH6G7ChJ54BzY7uQlTwvnXP3tVD/xdg0T6mmUB07BJVhdTPDcNO6obnL55h4+FotiK xB+4edBi+PWfyTbXZSLh1vdrGz6+CPqiOy0RbdfWTmdhDbfUc6CQCv0f9NWjiYOwMxiZ uw9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=sF4rYvxu; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id e5-20020a170902e0c500b0015a1cc6686csi13099025pla.622.2022.05.02.18.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 18:19:29 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=sF4rYvxu; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 92B785372A; Mon, 2 May 2022 17:58:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381005AbiD2Ulr (ORCPT + 99 others); Fri, 29 Apr 2022 16:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381028AbiD2UlG (ORCPT ); Fri, 29 Apr 2022 16:41:06 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D8F583B22 for ; Fri, 29 Apr 2022 13:37:34 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2f7c322f770so84425997b3.20 for ; Fri, 29 Apr 2022 13:37:34 -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=dAD7TU5bxFw4+mtb6XZpH6YJckvLCjHt6y7FOMRwG5M=; b=sF4rYvxurIR8HSYS3JDDW5zN4WVtRvWJLoykvKPRZlF2xUvwg49nOitD3FnwryJfzG q7yNxY2NXlCrhtPLxo9ZiAN5PVyxyXvMyHMP8TI78vutHXo4STj7VEhf7492C2Y+tsV+ /S6COa3b8gLTsTS6KwkR/kpJc/tmJ0jEDFXPv4WRePnoKxxqRUFo+kdbrbCuldPWepY4 scMjYHWSDzPDQcxdpgp2KwRs/AmLjQ+Jo93U1R8SCCGwY4XZEVOved3HyMyFTtqqZKtg fc+57Z4pGr2BfvmrY+PS4Z/ooYTznRcTEbHo9uQI0RVSXnPSEr9Piu6r59wPLL/8Og0A AM3g== 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=dAD7TU5bxFw4+mtb6XZpH6YJckvLCjHt6y7FOMRwG5M=; b=v5WDzelX8i0TZSGkPhavJaAWz0H6FcXFsW8GeYif796MLn/6khoqG8A2Ug3BFBkDCk 3FZ7On00/QOdhwgAr9w8xQSAP3z0loy5u/r5wGPea1QaeOtfAeOvkwCD/RxiSFPJy0zP C7Ix/0zOzvQAChsCIza5nOJOnYrk/Mr+hcvnBQGHFZ37RLJsG0nSTN0OOtyF3eu87lry Y2JvTpjhI/DHXsz1ugIR+b6vj6sLclz41BioWdN+Lv1rQUH0TJzPNTvEbZRypH7MdPZ2 wg5z2KapRasTVBpkLbF3r8tCbqj1LBpm10Rkq21mCRTkhvSw54iAGtKMakUNk1J6dIqX M9mg== X-Gm-Message-State: AOAM530d+53Ue7YtgV25W4X/qWE/CyLzaorjdTDZUhFTB6i/3mdNiNR7 JB/z7ULJNj5ovRMZ5KJzdfZr2m73uSJFvTIHIggL91/fY2S+cFk7FqSz4w4NjtHO8gbhuhPbQJ0 r0zCGgByelyNmVjv/zURqGgc1iKpgyJqYlX4W52qXa9VpteDLG7e+oadgZLGPmivJj0fKHVAVX3 JpNrG9ghujbg== X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:351:bea9:f158:1021]) (user=samitolvanen job=sendgmr) by 2002:a25:1443:0:b0:63d:6c01:d26f with SMTP id 64-20020a251443000000b0063d6c01d26fmr1397777ybu.296.1651264653259; Fri, 29 Apr 2022 13:37:33 -0700 (PDT) Date: Fri, 29 Apr 2022 13:36:42 -0700 In-Reply-To: <20220429203644.2868448-1-samitolvanen@google.com> Message-Id: <20220429203644.2868448-20-samitolvanen@google.com> Mime-Version: 1.0 References: <20220429203644.2868448-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=867; h=from:subject; bh=up7BEek35o0M0XxxZGb0YVxeAOsDA2frVViAIISPcAE=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBibExYVHtzXXfVkfpC4f30GmwEWwVNyJTrvW77sDTZ wzWWtoaJAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYmxMWAAKCRBMtfaEi7xW7mGLDA CTEoA/YLkPzO4RCaefNoqVsLm/slm3eKAb0EBTNjPQnz5eXoKCVQRKj9PWoPlcKYv0zhhpUXtVDSTh ac1XDqL26rGZoUjODIYRAKzZesDGF6mk0vMZegM83LL0VgP+HiMZb3/+JRnyO5lXl9biI+PKRs9yao cB6eP6nxZ2oJoZ3wi8wRjZa2dq6HwI1vjgqvc6wkIVZQB1hn1iiX4jK2s+b1RI6sSKL1KoBnu8ruUc XnRlTBjlHvsg3sv+Oo60X+xtVo4jt5qSlxPjVS36s+rcz8PjrRYMwuyiX1owAbYAx6891grqZ/Rtja zgQtJMT25Vbp1i0Ch4rkcNHucaP6MceaEMqi96kngq6U8NlFl+N4JSFjR9NwvRPX4zPYA/hjeYCpG/ AzTNfBREHLnSC45xKO3dgHPlu7+SNR2AwuC0gBm9U9UpzBYdOAHJEKi3xrii9tnkvtP20793/d3GJb h5zaP+BZ4RGrD05vaq3ji8gcCm/xu4Nv1ehokRtYYrvXM= X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [RFC PATCH 19/21] x86/purgatory: Disable CFI 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.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=no 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 Disable CONFIG_CFI_CLANG for the stand-alone purgatory.ro. Signed-off-by: Sami Tolvanen Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers Tested-by: Sedat Dilek --- arch/x86/purgatory/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index ae53d54d7959..b3fa947fa38b 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -55,6 +55,10 @@ ifdef CONFIG_RETPOLINE PURGATORY_CFLAGS_REMOVE += $(RETPOLINE_CFLAGS) endif +ifdef CONFIG_CFI_CLANG +PURGATORY_CFLAGS_REMOVE += $(CC_FLAGS_CFI) +endif + CFLAGS_REMOVE_purgatory.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_purgatory.o += $(PURGATORY_CFLAGS) -- 2.36.0.464.gb9c8b46e94-goog