Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp6397548ybv; Tue, 18 Feb 2020 16:12:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxccxtDuJtTe5MZhLC64SvGivIh9daKT6ndLbj/uP5QPsRxls9VD9yg2TxvkLGCGF2mwAOI X-Received: by 2002:a9d:7ad9:: with SMTP id m25mr16911056otn.13.1582071133536; Tue, 18 Feb 2020 16:12:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582071133; cv=none; d=google.com; s=arc-20160816; b=LN69AgM0JX8I1ZMgaZZ5/EBXacSf2ITPAAE0+KswehUU58Ycf685GgsjUoaLLzPlIf sqPcxml9xlNimbJx7T0LKxI7sTvQ7b/ozkMVHpICQ7quZNIb5PgklTAtnshFBjPDLV5s cDY8bpec6p+0iWf9auaWHmIVTk18BDjztcdG7HC3ekf8UIfDRTSBSfc+J1Q/HQqdRoWn OjK2VDB7eQdOEOVkZmuF2auPcevPUls/Vpi5cXFBeXaXxOL9AQKv3+H23QSh/JfaOoQ1 +V+qGL2Eg9nluPurfq1KJhMxHsldj9Kz9+UJN1zcRSTRnZJ/elhC5SwMKGp1bojcsxoD qUxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=ou3AmoAB4pAV4E8hHdrZJU8tYRoLaJy68OnSkjNriPk=; b=xSSVogp6+JQVNvMCGJl/20N9ofjZibkxynDy1isTGMn6tzyAqvmFsFmnzzRinUYiiu vhHwkxrDuQ6yR5AYRJX6IAHrKip9PUGEgRGoY7Ek0A4079KJP/uTXJDBZI5fMZZEGoLg io9ZzogON8y+3sarz8jFA7N3ZTKQBXxhr0/gMzRrCDbXvYzvIwAteyXaeHmjcPNWCk8J BKCrI3s1db5x8yf9XHSaUD0Y3zruBShi/4ED7UywKxAtV59ddMam7hDPR6vrpuCyAUEC C40skXZ9yjAyDRFGaFRZ6FFXXhWkxVpWeNm/H1KGzb4phZuU9pMtcXlTX0aOvz2Z9LNW iAGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ExdFaXJL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id s17si212508otr.320.2020.02.18.16.11.38; Tue, 18 Feb 2020 16:12:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ExdFaXJL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1728111AbgBSAJJ (ORCPT + 99 others); Tue, 18 Feb 2020 19:09:09 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:43917 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728073AbgBSAJI (ORCPT ); Tue, 18 Feb 2020 19:09:08 -0500 Received: by mail-pf1-f201.google.com with SMTP id x199so14293612pfc.10 for ; Tue, 18 Feb 2020 16:09:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ou3AmoAB4pAV4E8hHdrZJU8tYRoLaJy68OnSkjNriPk=; b=ExdFaXJLQUrLqD1cXdvV6V+f2pvG4gneydCqd14okgp/Waqa0Qii99gHccZPxv5u7T ful3UrQEJD0mlccXRaOv9ncjUpURLfgt1M2GftTdPAksHrqi4oP/mH8JmpSYvfwHIm7J e3+kj63xZtRB4dCYxQwR6HNmc35LUxGimjg5k2n2O8xxH439zv2/XtncK8lwRfMu5R+O u4llohrY6SlfXI9mRKQ2oYKubkIkauF/gn83zq1xPCFdbiaSThaYvjtA6Lb7Zay9qZ6q H8vw2D8eYgjNx+t+KvfMrj5S0vZf+h5Qmzl6mlBhwILCDL8Jf2+qBwxQma4EGN9GtIZX bJrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ou3AmoAB4pAV4E8hHdrZJU8tYRoLaJy68OnSkjNriPk=; b=iCvVevbngt+plJgtQl5jBA6jYPJ/61fq7e8mjpIE82ID8cVzRsImcRmCXybSgmHy1g WRbFb+mOGPmbXHFAz0CW0WfyltqAUAYX1y6j9c0KjdwqlXv/TPl9wwf+xatrgvHZevaM 42Ia60yHuOUeKMJc8dMFkiz0aCFXhk/nQRVn2rpb+JVuB17QK55XU7Skb322gxnrKaEl prcawqQpJ3kEBAse3u/1liFILb8tjToTmVcl23CNgzDFlzqTOAxsScEV9R5guywzDjdp adRf9BxRptSnFG1jQ0YhG0LpsE8bXfbjCdz+N58datJ643dC+wOJJA6eCVTfTbSLjvmw oKZw== X-Gm-Message-State: APjAAAX3wF44+w6JT9x2C3Nq8U0Yi0krKE7kj/vvI/zuMZWIoZO0eXSH sG5IoelRO12t1c6DvMCTAoOxrkk+gEDJJN5QU9M= X-Received: by 2002:a63:30c2:: with SMTP id w185mr26462644pgw.307.1582070943849; Tue, 18 Feb 2020 16:09:03 -0800 (PST) Date: Tue, 18 Feb 2020 16:08:17 -0800 In-Reply-To: <20200219000817.195049-1-samitolvanen@google.com> Message-Id: <20200219000817.195049-13-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200219000817.195049-1-samitolvanen@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v8 12/12] efi/libstub: disable SCS From: Sami Tolvanen To: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland , james.morse@arm.com Cc: Dave Martin , Kees Cook , Laura Abbott , Marc Zyngier , Nick Desaulniers , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Disable SCS for the EFI stub and allow x18 to be used. Suggested-by: James Morse Signed-off-by: Sami Tolvanen --- drivers/firmware/efi/libstub/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 98a81576213d..dff9fa5a3f1c 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -30,6 +30,9 @@ KBUILD_CFLAGS := $(cflags-y) -DDISABLE_BRANCH_PROFILING \ $(call cc-option,-fno-stack-protector) \ -D__DISABLE_EXPORTS +# remove SCS flags from all objects in this directory +KBUILD_CFLAGS := $(filter-out -ffixed-x18 $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) + GCOV_PROFILE := n KASAN_SANITIZE := n UBSAN_SANITIZE := n -- 2.25.0.265.gbab2e86ba0-goog