Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp1878509iol; Fri, 10 Jun 2022 17:42:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG94NmysZHxMAgY1bcDWzKzesZfYoEeK+m6dfT8H0FXtkaq1u/mhpzzRIvcE/ZGJqVUI/y X-Received: by 2002:a17:906:73cf:b0:713:f60a:8f9 with SMTP id n15-20020a17090673cf00b00713f60a08f9mr331822ejl.124.1654908140475; Fri, 10 Jun 2022 17:42:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654908140; cv=none; d=google.com; s=arc-20160816; b=dRrttwjkcBa8Mr/rzr6zddG7j1PVAVDnmsqsV2CXKuG1pzkgy0NYFWLsL1epAaGV9a q3C48FeHpWavF7UDZaauyYXrAMJFlzGJzi4d+pAJ8vt4E/c6hTWQQcEfSNfxZArp1gNI EDVRdCell0rBPPCOMNtfz1uYt8BA2bXbAnZeMVaKPsOQZRm/w81R+vwvB75jPlBcvXre VPhofsoocuWjI5fuv8a6eQpqcD2Da4fL1jXvfGqBOVdYdQmO+Q8kWJPvHVHKjXatkFMU wpOjhD7bR07VxUEVWU+u8ktqhp4BXih/4jF5Y8706kkFCoPoEqXExuMp7shwBW0HNztg X06g== 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=NebnbUevd7O3L4DZUnHH2cfPN5CPKXFBfrXdmTOrusA=; b=cuBsBtrmLe5Ce8+/db6EUz2ZeiQPi2EXAqMNkRqISTfyu9sX60zgfndiihn0IwY5qQ wctGRU1v3yGoMSuYMtWqM8w4jpyedljW7SaG78IWT6WgHJV3SkOL8Yd8/miUJDpv8DqT ZUAiY/7Z9MKlcvvY9GmQwcszzgD3RmGZtV/7/9D18NclQWTRBK9jqwKc3hLaqnoIhHAL 55FvfZAt/E2HJyICc3HcErNcVGhk2IQCCF7+BrOVpeMje307+3rtqzfi+WO109d14v52 JvYi0RPXKzYIYeMYBs2Y2zPAF/7EbXSM2PyD7dEmPTkni3XhIYYyufABVQlU6+46ahKB gRYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=KKJz0ETK; 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 hp31-20020a1709073e1f00b0070a74fde173si532104ejc.410.2022.06.10.17.41.55; Fri, 10 Jun 2022 17:42:20 -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=KKJz0ETK; 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 S1351110AbiFJXhf (ORCPT + 99 others); Fri, 10 Jun 2022 19:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351016AbiFJXgo (ORCPT ); Fri, 10 Jun 2022 19:36:44 -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 6F7C8299787 for ; Fri, 10 Jun 2022 16:36:02 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id z67-20020a254c46000000b0065cd3d2e67eso561353yba.7 for ; Fri, 10 Jun 2022 16:36:02 -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=NebnbUevd7O3L4DZUnHH2cfPN5CPKXFBfrXdmTOrusA=; b=KKJz0ETKMeSBcMXnJZjZzeLcSxRSw/g6ohEJqB/0rJWBgf4O7ADHPH5kU9Xluuy/XT 3SlAe7Z2V+5bh51W0KcedotGu/qgjThHz6ojq/xqG3z9PbC4K4Xz+xgc6hTpQzNLaKgi Xbsix6EkV+RvNC/YiWwda98NnsfGpQ4h7sS9l+4FoYRnJks6OhV2lU3T8FOmsDsgUBBT 3Y06pvNAxA2Sooe8D9naqKp7IjcYWnBD27Ep2iihcbGhxM2a9yPNv/UsuM19hWUqiHxo crcwgtBlgH40phoQX67UjusAcKfvxfyDl2nXhnMBPgQWXrpXgZb+17RxEgaNl/ZxRXul UJFw== 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=NebnbUevd7O3L4DZUnHH2cfPN5CPKXFBfrXdmTOrusA=; b=F3STsjCxroCagdiYE8lXUa6uRnN96rRHj2jjDPOPAyXs/vwr+TyLLJfOlPERJD1Eqo 9qdgECH4bLLG2IMfDR+aVAqU9rrWVd1mQrogjHGX+YYXbN4W5ot7mFXR+ar9XKwbjfcG 32owpjajBZ8S2JFY5lFSRpQ7oJbKYRUxCZx25ZEtt+rFTQFjQP47qIXzVLzzU9lIzjcW HTezeRcwLyA3DdIkkNEmP7lmA5NKBQfT4AEt4ERIqJ7yO2OLmZu1SEQ+uFKsiXHhPyc8 XTCVt/vawciQb7DPbLWYJdFYAZYWWR+7zxIhK0SXbjNryKjTuZPahf3cCqPvbRKnChKZ f2Pg== X-Gm-Message-State: AOAM5313P6otw9RN1cT/uiBDTuuhTwbo3JJAvhaZ75Hi08g2LmuIgxFV BFhYzXmjfeA/aONGO0CIFW9wY8F1b/brKBnYuG/Fhz9zivLIAq31vw/cqR41gVdcv6/NXT5krkZ xDdIVHvLdItHoy++BCY1XPZw232qT63hqelHcJZgTQMi04npUGEKk46aONSvI1Ww4SgK/SWIO7E J7v85c5PZSKA== X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:f464:6db6:3d47:ed14]) (user=samitolvanen job=sendgmr) by 2002:a05:6902:905:b0:64a:2089:f487 with SMTP id bu5-20020a056902090500b0064a2089f487mr47802874ybb.202.1654904161997; Fri, 10 Jun 2022 16:36:01 -0700 (PDT) Date: Fri, 10 Jun 2022 16:35:12 -0700 In-Reply-To: <20220610233513.1798771-1-samitolvanen@google.com> Message-Id: <20220610233513.1798771-20-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=915; h=from:subject; bh=ArPYWKwU35vK9Q7fuJlo1ALDBI9fX95H0CE4usoZ/3Q=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBio9UvnQCq/98P6oNAklKJC8WEg93jIEEZ3s64nlfE jwrc2t2JAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYqPVLwAKCRBMtfaEi7xW7vmmC/ 9Qrdc+4b2GDVRqmqvGAW33iyBJiMYbCO4QDRAxsqvRUhT5K1vwyy6qVCAUsRMiltfbmxmPfrsqZJ4N hVmPqbb/xFmJ4/2VWkeHN4jV/0Ms9EUsFTVsPjSguMqImRg0ydJ4IIkrzddZZATwLAd87WWt5x6woP CtHUksEZGn7o4Pp5ct3NUz83Hb6LHo2m9mjOGPg1r33oforu2vx/OfVCEjx73Xcxo6RDIH3UsDuD/g /s3THqOg4srXhMfFGuDwEKmrtvLlhmpsNQIsAHYQMsq+8GlhciaZg121OkGkS4sL/rnpTey/W3To3I duP0DhDBHWFptNY8nhoygvOPOT7N9DVYfAJ0SrSvoOo2h7FmdAi5XhhyvjVZvys4tcp6shnIG175cb 0lmK0RZFZpwqCNOr1PORsFlHiTeRUcKrve4AplmbR9zGkRHED1lI0LtXSbIIcWu+5IP8ooqVNxOVYr sCtJLXG/F9yAngLbw5kbgWwO7iZTHLWHbfFTd8TAmbaqg= X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [RFC PATCH v3 19/20] 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.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,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL 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 Disable CONFIG_CFI_CLANG for the stand-alone purgatory.ro. Signed-off-by: Sami Tolvanen Reviewed-by: Nick Desaulniers Reviewed-by: Kees Cook 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.1.476.g0c4daa206d-goog