Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3712707pxb; Wed, 13 Oct 2021 11:20:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0PL6+eiDi7DfkBEY/MkXNoF9IuwKq4xUdsdC/4i9bYemwU9PvQYkIQsunHOxPSXHdKHGt X-Received: by 2002:a50:d8cf:: with SMTP id y15mr1418392edj.66.1634149221606; Wed, 13 Oct 2021 11:20:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634149221; cv=none; d=google.com; s=arc-20160816; b=d9PinZECFLOh78X8h2x4sZlHftKMsrPVlyjrxIczEluzfZrap0+xvrjbBb+VxXQgCZ JL0+0y/T0IT4ZLfJSLYabR3R9sLk4PDGw7LJHCUfn7o9Ome6LFqp+zz+dm/tK9VDh2rr frwcnAVxhIKa47/TcE/+3p1A76VvCZ5iDZxdh5oICpqFlzfEshG+9MOHSykFDeAeFnXW Gf9mq16vqSHdaN/ayBRPMi7EbIR8uj6MhZmKSl+Z3AA0fTjZ0ItRckWGcFbiRypxP58j v/Xx+RHFdDBiRFzJMpGv2A4TChb9MmPvYSpHWpbpgPWy8z/qhDPProyOJSI2Sr6KF0gc 9dUw== 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=lL161ulzwVpOLIiyInhGTUWjQJeC/JgvEHFDwGDnedU=; b=wye/wTxQiIvRQ0RpUKylHBvEjikMrguefJcA0MoaGaAwRSxx0MIr/PivKaduiKOD2v 4mr8hrCS1wdmwEqGvjPzJGAwHIEEAUc72u6jcGRV2TQkdJmypiQNpXvFHQs9cAgrsqtI Lhxr0r7Q4R2KIlP3BG6zdI6+HQsms8AJXTPwYEY2yAs/sK43+XbMTlT1SgFNsYeP7wRQ boA/ms9G0iN9crLlXpkS9/odDERlyyEsuzsoO0QPzhZ3uNKmupz7nrhsZC/YsL+nbtpW V3gDoYTkD0ZWXBXIXvZ3IQUEcuhp9kkRNtwwJMTFTYaV6qiOHQ5f+iR5ovMuU3kYLBTT xIoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=OFH+Rtzt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j25si277734edp.251.2021.10.13.11.19.58; Wed, 13 Oct 2021 11:20:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=OFH+Rtzt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S238739AbhJMSTq (ORCPT + 99 others); Wed, 13 Oct 2021 14:19:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238710AbhJMSTd (ORCPT ); Wed, 13 Oct 2021 14:19:33 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4003C061766 for ; Wed, 13 Oct 2021 11:17:25 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id u84-20020a254757000000b005bbc2bc51fcso4083128yba.3 for ; Wed, 13 Oct 2021 11:17:25 -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=lL161ulzwVpOLIiyInhGTUWjQJeC/JgvEHFDwGDnedU=; b=OFH+RtztT4LKZGpjFxg9u3A/b8A/gDFoPIVZ3haK+jHHcDFThDpQ81L5dEKrZaxGGY RQ8z4tFYZs7Y8a7I5bTdCPrEmA13+spOpmFoe0DtL/PYMFKOvGfJTI9iTm6vBZNIuE3q TSr4Z+jHT8salyxjSIFNhb12RSe69FNLBosGRUlwnXaeal6sjzHcSyxoil8VaYuT0UCO 6BoAbuTcCrBwvuiP4oqeUjvoCGlEGOGj8ZVl57GpqDMc0ueMXDtHFsaZGyDUsSNqIHga vGF6kxtOOklpQNLuOjOZHdnyn2Ng7d8/9qooe4gz2KfdFeeaDlmpgV7geeZV6QpoCtXC EsyA== 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=lL161ulzwVpOLIiyInhGTUWjQJeC/JgvEHFDwGDnedU=; b=5ZQZ013optDOwDUZ0kVW/j2dzLfKvUMW/aaHDFyBQsi3H0wZ4ArGnvquR8Cee8gIJg Jks3SwLZDie6igeH+l6qa4Zkpkrwk8DhiDgk0Sw6nmBRgKlYkMCNHZ3bj2fgIGubstIX DE8MSMs/PfGeMGoC1EtLxndb0QyQtPsrk1x42533B4jiU8PTMHoWsxfSjUmGv1nneU4A sbm78ulawZfKCgnnKs98VKGYiS50duKJzYAZoZbgGrLkgbjY7elIcEhl2fxD1cSIXWHm XDxjOGmZaOpBnOSO+bodo3MFQvpyqig8muiS3ebBz0/B1XYJIXB5BxN03TsfA1XAVXxQ 9Uig== X-Gm-Message-State: AOAM532sfUbsxFU8TFfDw0yPhhT2Uh7BLdlheLrNqfxy+G8gXx5kDvkK n4/kuqrx8oWtYEwXQTouLN7ceAmzctpaNX5AzVo= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:9ea6:6c27:1876:926c]) (user=samitolvanen job=sendgmr) by 2002:a25:bacd:: with SMTP id a13mr1100349ybk.216.1634149044930; Wed, 13 Oct 2021 11:17:24 -0700 (PDT) Date: Wed, 13 Oct 2021 11:16:53 -0700 In-Reply-To: <20211013181658.1020262-1-samitolvanen@google.com> Message-Id: <20211013181658.1020262-11-samitolvanen@google.com> Mime-Version: 1.0 References: <20211013181658.1020262-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=868; h=from:subject; bh=FytOEU/o+5YY/23C9OnxYawqfdnsBa9l99avSRS3UMQ=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBhZyKZ3wUeZRICTWvqz+5tX7enGcxOiulLDncxN782 C5imk3WJAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYWcimQAKCRBMtfaEi7xW7g8BDA CfQOpJaURms6+ukYXYN8NRrGNVO0v7udElJBWI6Fr/puTtac0gu0RDfwnabwKlgFqXahBQACO3QckH Fm1CixyTfUaBTwHAh6IqrsEY0HPyH/mkWE6n0GzBeC48AZ4pHI53B5cP6Dm9CBd24SfoYYKQY1fCUG Q54gCr+hHGoh0xlj370a7yiCsRMJLhkISnDJinh32xIEiTaFR8S7z095+sYIPbkyk8idyt8sPgsstG +u7COVATax5IoMLybwEy7wFJ0mJjFIhC4JFCY8LvGyyZMjWK5Y4FjLmD1YbynZ1eTlMmq8/l1VypHK XviQgeMOS8og6i3GT6eBBphz7C4weOfTpbMgMiMCK+9nzEzwWi2vVo77xKmdJ940pR3F1PBzLxboB/ gS8EvfZ2Goojz5yRT0buuzcLwjqFO3VPkjTo/IplXmAZ175rp/1TWfEe2I8QNcOIc5EIB949XHspP0 3xKBLpIxUMCav6tY9chMdoowy7wNBH++YQRyz76T6m/+c= X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v5 10/15] x86/purgatory: Disable CFI From: Sami Tolvanen To: x86@kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" 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 95ea17a9d20c..911954fec31c 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.33.0.1079.g6e70778dc9-goog