From nobody Sun May 5 06:44:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1601221063; cv=none; d=zohomail.com; s=zohoarc; b=bcOr8m58bsrWYm/aG3A4zdvSx8gOd/UjoOeRWE/TUc+VBqrTAqUrzy2q5Jsw4n7krnLNakN1ScwnsqSvEDgLIQaMxErrVEX28qOmrTKXGhVX5tWUWrS22SGZMj6Mbb9PGTu3OOkVEeZaN6OlKgOwPhmVIfa4rNMzGzssMou0AKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601221063; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=79UcSB+VIGzs7dqFBdpd3ozz/3DgC8kB5fgkb+XEKpQ=; b=exzAUMC4SsS9+Ud6DByoeAtq3E+eP75oqsYpEZrnZ1u6UkqtgoZ72yBtqOZpMeUIVVP1s39+BM8pi5pWyjNGkCx8E5hncQzu/Xbhh64rZBY3HzrczSODkD0o/+ah9wO1zQUqglY1GWqZ3qZnC6013ofMaiht6nBT0WXQWMicpe4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1601221063096712.3609838686274; Sun, 27 Sep 2020 08:37:43 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kMYjf-00006n-CE; Sun, 27 Sep 2020 15:37:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kMYjd-00006i-Uk for xen-devel@lists.xenproject.org; Sun, 27 Sep 2020 15:37:10 +0000 Received: from out2-smtp.messagingengine.com (unknown [66.111.4.26]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 88ad5daa-f603-400f-b3ca-16fa491a7b1e; Sun, 27 Sep 2020 15:37:09 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id C01065C015C; Sun, 27 Sep 2020 11:37:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 27 Sep 2020 11:37:08 -0400 Received: from localhost.localdomain (ip5b40aa59.dynamic.kabel-deutschland.de [91.64.170.89]) by mail.messagingengine.com (Postfix) with ESMTPA id 905A73280063; Sun, 27 Sep 2020 11:37:07 -0400 (EDT) X-Inumbo-ID: 88ad5daa-f603-400f-b3ca-16fa491a7b1e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=79UcSB +VIGzs7dqFBdpd3ozz/3DgC8kB5fgkb+XEKpQ=; b=UtMyWNx2nQ+KilyrxIWHWD TRB5DW2/DStcNjFIxwGnJNPVfhWibJXpUEU/xqpk87a3YOuDrepuLVydYfWu/yKq jQ2zk5pUutSTNkEOxQQNnAzm8Njm5MOI+wttZL7Ia2ukzrPQNV+SHLIFixnji8Hu QHvwQOkv/MnfgnwdEMj5Ih8xYE9eOD2Zw8DJcBAXoFv7gGtp6iI9FmMPccVo1E09 f9rkR4FdSq0GIJnxTTChirped6B3cC6o3THVrei/df6sXbb4yVQHu12M0F1q7sie Lqryvl1qnvbQSYAPkcvQ09gJCp6vrmfJYqb8GgfihNIVKUmnp05J1ZvJab51X6YA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdeggdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofggtghogfesthekredtredtjeenucfhrhhomhepofgrrhgvkhcu ofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinhhvih hsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgefhieel ieevveeiheetvdeghedvgfejfffhjeehleegueeuiefhieejgeeliedtnecuffhomhgrih hnpehprhhothdrshgsnecukfhppeeluddrieegrddujedtrdekleenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhnvh hishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/S3: Fix Shadow Stack resume path Date: Sun, 27 Sep 2020 17:36:57 +0200 Message-Id: <20200927153657.304553-1-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Organization: Invisible Things Lab Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Fix the resume path to load the shadow stack pointer from saved_ssp (not saved_rsp), to match what suspend path does. Signed-off-by: Marek Marczykowski-G=C3=B3recki Fixes: 633ecc4a7cb2 ("x86/S3: Save and restore Shadow Stack configuration") Backport: 4.14 Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_pro= t.S index a2c41c4f3f26..c6b3fcc93d93 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -69,7 +69,7 @@ ENTRY(s3_resume) * so SETSSBSY will successfully load a value useful for us, then * reset MSR_PL0_SSP to its usual value and pop the temporary toke= n. */ - mov saved_rsp(%rip), %rdi + mov saved_ssp(%rip), %rdi cmpq $1, %rdi je .L_shstk_done =20 --=20 2.25.4