Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3528628pxf; Mon, 15 Mar 2021 11:34:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTZ0ckL8862ZI5Hls4Sqvf+794Muswg3SbZuTlcKQRwm9CiCTd6fFazrvut4u2Ww6Nt//Q X-Received: by 2002:a05:6402:4301:: with SMTP id m1mr32487746edc.210.1615833257245; Mon, 15 Mar 2021 11:34:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833257; cv=none; d=google.com; s=arc-20160816; b=M4GN4VMwsSXyxyNcjTHLVZSoNbxDmR3dFmvocBnppiYaP7qZTfRMMGW+T9Emqqsvuj sp9htGeIhPrRA3hdBBNqEbYXut3lWyFKQcnZoX5/+L9dIi4QvsTNbmBNDkvJzkjczP/f ZYxigg+nyOmBqD7uTxAxUTvAXhploCHiTf/I3Abs8D2QFQPBUVsGWQd0UOTOQ0vEzP9i FECV7gTRO8xXe1RKiGPRORRVgCHctvf6aZI753SlGgsifgIVEe7wVGXHetVC+ehCjE4z hMkFTxqQyAdM1Dj4TYNgPvHkYyK1/IxVlfs4rLEUpnkSwnbObsqnE/j8eRQ76b6FiEA0 wnkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pSvSZMJW+Llp7G/0aNaBoUs3GlKuNb0UCO+OMAaEGL4=; b=Xtg550HrcpcLJY55+NdmkABs5eL+0x+9eswu0lZwCTxO6n2ZVPz7v9A/cWHfbNG+V5 /r9/2EM+bNQXmXOf2Ash27l8sAls9oUaxHszDYEkvKXMKp9ofoUZCsmyOFcXcSnV87ay uOd0KjYLw8ZRxCQkwfTqxH+YON81WUnzSV43zF7bY056P7UA5fOxugRXX8Vlofw+1jF8 qhyhOpRqKJpsF+gITe6uCNGfcQVomwxojle2P/ckFu8uIyv8L/3Dsfqb+iGg8to6P5h/ iNlIm6bU+l05bYZKHyZQE8KBwx4fgN2+GK5d39QVeLneX8lxoprvHDQuIP+ni2eXuhvi PcQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=THUTm2s1; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i25si3591003eje.58.2021.03.15.11.33.54; Mon, 15 Mar 2021 11:34:17 -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=@linuxfoundation.org header.s=korg header.b=THUTm2s1; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238293AbhCOOqE (ORCPT + 99 others); Mon, 15 Mar 2021 10:46:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:52484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234592AbhCOOE1 (ORCPT ); Mon, 15 Mar 2021 10:04:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3608464EE3; Mon, 15 Mar 2021 14:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615817064; bh=zkW3X2cjuHyAapqmSQFKgFaH8zGEnwvw4p/lYgJa3kc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=THUTm2s1yR9EIbYBUm1nJhq++S58lossXtcdChNqkZ5nZKbMCmkjfGCfbwCk5uh8o uNKwR53GU9Qo3wMeH7DoJomlbr/zc1nO+Dsn9DgiU2CnsMg0/v6DanepvlXV1FAXUl IkfkpP98abxEIR7EuMDI8DeqxUUhZGQJBCpRylQo= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joerg Roedel , Borislav Petkov Subject: [PATCH 5.10 270/290] x86/sev-es: Introduce ip_within_syscall_gap() helper Date: Mon, 15 Mar 2021 14:56:03 +0100 Message-Id: <20210315135551.141688745@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Joerg Roedel commit 78a81d88f60ba773cbe890205e1ee67f00502948 upstream. Introduce a helper to check whether an exception came from the syscall gap and use it in the SEV-ES code. Extend the check to also cover the compatibility SYSCALL entry path. Fixes: 315562c9af3d5 ("x86/sev-es: Adjust #VC IST Stack on entering NMI handler") Signed-off-by: Joerg Roedel Signed-off-by: Borislav Petkov Cc: stable@vger.kernel.org # 5.10+ Link: https://lkml.kernel.org/r/20210303141716.29223-2-joro@8bytes.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/entry/entry_64_compat.S | 2 ++ arch/x86/include/asm/proto.h | 1 + arch/x86/include/asm/ptrace.h | 15 +++++++++++++++ arch/x86/kernel/traps.c | 3 +-- 4 files changed, 19 insertions(+), 2 deletions(-) --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -210,6 +210,8 @@ SYM_CODE_START(entry_SYSCALL_compat) /* Switch to the kernel stack */ movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp +SYM_INNER_LABEL(entry_SYSCALL_compat_safe_stack, SYM_L_GLOBAL) + /* Construct struct pt_regs on stack */ pushq $__USER32_DS /* pt_regs->ss */ pushq %r8 /* pt_regs->sp */ --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -25,6 +25,7 @@ void __end_SYSENTER_singlestep_region(vo void entry_SYSENTER_compat(void); void __end_entry_SYSENTER_compat(void); void entry_SYSCALL_compat(void); +void entry_SYSCALL_compat_safe_stack(void); void entry_INT80_compat(void); #ifdef CONFIG_XEN_PV void xen_entry_INT80_compat(void); --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -94,6 +94,8 @@ struct pt_regs { #include #endif +#include + struct cpuinfo_x86; struct task_struct; @@ -175,6 +177,19 @@ static inline bool any_64bit_mode(struct #ifdef CONFIG_X86_64 #define current_user_stack_pointer() current_pt_regs()->sp #define compat_user_stack_pointer() current_pt_regs()->sp + +static inline bool ip_within_syscall_gap(struct pt_regs *regs) +{ + bool ret = (regs->ip >= (unsigned long)entry_SYSCALL_64 && + regs->ip < (unsigned long)entry_SYSCALL_64_safe_stack); + +#ifdef CONFIG_IA32_EMULATION + ret = ret || (regs->ip >= (unsigned long)entry_SYSCALL_compat && + regs->ip < (unsigned long)entry_SYSCALL_compat_safe_stack); +#endif + + return ret; +} #endif static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -686,8 +686,7 @@ asmlinkage __visible noinstr struct pt_r * In the SYSCALL entry path the RSP value comes from user-space - don't * trust it and switch to the current kernel stack */ - if (regs->ip >= (unsigned long)entry_SYSCALL_64 && - regs->ip < (unsigned long)entry_SYSCALL_64_safe_stack) { + if (ip_within_syscall_gap(regs)) { sp = this_cpu_read(cpu_current_top_of_stack); goto sync; }