From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E885C2BA17 for ; Mon, 6 Apr 2020 18:23:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ACDA20672 for ; Mon, 6 Apr 2020 18:23:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UPvVgdH8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726638AbgDFSX2 (ORCPT ); Mon, 6 Apr 2020 14:23:28 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:53092 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726475AbgDFSX2 (ORCPT ); Mon, 6 Apr 2020 14:23:28 -0400 Received: by mail-pj1-f67.google.com with SMTP id ng8so206967pjb.2 for ; Mon, 06 Apr 2020 11:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=t1E7i5Ja/N4v3hN9ILxMO9xPBTPnxiRK5Clfelm4oBw=; b=UPvVgdH8M87ZZpVFk710GBac6Ivj+/QhMtWTYlwmRZOj1tj7f2kNEC+ZiI35QZ5dL4 MGx/U2nXkhynTePhJKF2P/g9mbGDtn5+ErGMSjnhl32QKNOfQYn2U+paYJNipAm3VyAA D58HSMWOlbmLBj7Gg5Te2Kpdrw+3StLiF0oh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=t1E7i5Ja/N4v3hN9ILxMO9xPBTPnxiRK5Clfelm4oBw=; b=dFUTZqatkXkw/L5EwgOhsML8qyPfhE9IfdkM/7aHi+5vVIJewuNGGk/yJP9B0WEQhB 8/+tUcfObO6mpdqwwpm/dHcKTQbxYu9+/lg4QRyxB7etL6ucn+HY+ZKCBqwxx7I9P2Io dXCa103YVW9dU4itmcI/TQ+54N2EWK9ulGgQtwHELhxZ3muyfQPTVCMgF8kq5oj78QGR lOAF7kd3ARaIeiWafPbNM+GwPOyj9EELgA+aRVsP1d1vBf8HobYAnAA7+8jEBJmz41Q9 ilALpMKQbmpZhoWGEYmNuEZrlD3nERjBGobUhFdTYpSMUQcKd22/530nqvOKAjQ0qoGV UtwQ== X-Gm-Message-State: AGi0PuZ3nXAowWoRHcytb2xNilngURHYIMREVnZQ61T1duEoLqb/FP7R 041GofqvVs4hjO3WByBdbhb1sg== X-Google-Smtp-Source: APiQypIUOtn72OybuMmOpw7ZoRHvYwoqpUGT0d68iEfAhBT8YfgewjV9UGIYBvXQYFb80jItY6ieRQ== X-Received: by 2002:a17:902:d685:: with SMTP id v5mr22055094ply.256.1586197407139; Mon, 06 Apr 2020 11:23:27 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id e184sm12005953pfh.219.2020.04.06.11.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 11:23:26 -0700 (PDT) Date: Mon, 6 Apr 2020 11:23:24 -0700 From: Kees Cook To: Sami Tolvanen Cc: Will Deacon , Catalin Marinas , James Morse , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland , Dave Martin , 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 Subject: Re: [PATCH v10 09/12] arm64: disable SCS for hypervisor code Message-ID: <202004061123.CE436424@keescook> References: <20191018161033.261971-1-samitolvanen@google.com> <20200406164121.154322-1-samitolvanen@google.com> <20200406164121.154322-10-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200406164121.154322-10-samitolvanen@google.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 06, 2020 at 09:41:18AM -0700, Sami Tolvanen wrote: > Disable SCS for code that runs at a different exception level by > adding __noscs to __hyp_text. > > Suggested-by: James Morse > Signed-off-by: Sami Tolvanen Reviewed-by: Kees Cook -Kees > Acked-by: Marc Zyngier > --- > arch/arm64/include/asm/kvm_hyp.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h > index fe57f60f06a8..875b106c5d98 100644 > --- a/arch/arm64/include/asm/kvm_hyp.h > +++ b/arch/arm64/include/asm/kvm_hyp.h > @@ -13,7 +13,7 @@ > #include > #include > > -#define __hyp_text __section(.hyp.text) notrace > +#define __hyp_text __section(.hyp.text) notrace __noscs > > #define read_sysreg_elx(r,nvh,vh) \ > ({ \ > -- > 2.26.0.292.g33ef6b2f38-goog > -- Kees Cook