From nobody Sun Feb 8 18:15:54 2026 Received: from mail-ot1-f74.google.com (mail-ot1-f74.google.com [209.85.210.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA3F6313550 for ; Fri, 6 Feb 2026 22:28:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770416926; cv=none; b=prkALBF2qQi3KhIj2OhIg37b+CkHMWQaN7rrwuwku5YHPc6rbF23BospPEzluZQADnGlkJMpB4wf5lPiZE/GtlQOKwtmC6i+EKrUBJiH0T/NdzUd11ci6baFI/0+K8IKqcOuRcW+uim/Z/ZQ1sJ/Zd6siyDcNuXnc30JKnYoAew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770416926; c=relaxed/simple; bh=BZpL1RE9XfDIgFESeYrbtsYlln4FTRDnK6vMRKcrB4s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WgMcJGZGOuMZw+Y3RYx5PB6pvbADNBHbyUBad7tPP5Fvx89h9c1zxyTNQ2vu1WleyJmAhsyhLRdJkgndCqyfMAn7mR8bONOT6FUjv/ZCw6pudgp7JP0fLHwi47cxY85GcOmyjhRfK3kqBVQgNzjgDIeVA1/4OtCIz+u/W/2+vj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sagis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ECyf30SX; arc=none smtp.client-ip=209.85.210.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sagis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ECyf30SX" Received: by mail-ot1-f74.google.com with SMTP id 46e09a7af769-7cfd12d8245so2808671a34.1 for ; Fri, 06 Feb 2026 14:28:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770416925; x=1771021725; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sPoqEhUMmdDPahIwHzxtMUXZ8ToMdzI8JESAi3VAuZ4=; b=ECyf30SXfnbDrAsm2d9JaAmd1cS0YS8eSkvmGyqH01syNolvs+g9Bd1r6NrXy3+alr K2fW3to9Mq9jSQoVFDNoQBYTNrX0gCO2vsEgHJZ+lBm1g1+K/lJ2ierqJste6DqxpNsO +m6cBcIGIoUA+X/PPQkj3ATQkEnF3jkLppHuqpIGm/reQg1yLXOaKog84p5kPd1c7Fxg joGNmkq4Cavw1zZF6aLVkWG/OVnZvqSENxqe9GH5B3TehRGHdiSF27K+CRu1No4PNkfa 3zhKdQ8Q7WlZksFQL1PPpMOJ+AoZZpnCVfBTCAQvpRnAB5kPIgzRj4HSfBsDiCgvWWAZ yCpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416925; x=1771021725; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sPoqEhUMmdDPahIwHzxtMUXZ8ToMdzI8JESAi3VAuZ4=; b=Xf6+FjjZ3ktjvVwStSsDXnoONMM/7UwJoqSb4Q624i1i5/b61gIdPH3m66Hd2JPm9/ pB41v7Rp36ZOMu1q8CnZqUX40PbO0aMrMUVyoGVo+Bu6ajVLX0+8gYhE16ObMomhKYWl IdL8cmw9R3029qhj+tGCzRcusbjqkEMR1jBR9GI8fv4obNi2RV7Jv3Af1vhMwh7HEZF/ TLFzYKjrVk2HpZog8dzfVN1xZqCwroE9QcSCEF/n2ONbaGI3kheQoplW6+MH6ge3zM8H UCEBKkf7jt3y6oNYj6IdciVw08JKv9YzNSEKVwqVMmLKuJubCwfrYVdoKpiCJxiUKuHd dANQ== X-Forwarded-Encrypted: i=1; AJvYcCU83ADcN4L+gAbEkcR5ZmqCcGS+c2foErhzVlLVSNvoZ2hlHRsHzM0G8Jh+rZWKFyLj8NVrpHSUQTqTays=@vger.kernel.org X-Gm-Message-State: AOJu0YxNLnDa237VqTx3TaUyTOzzzxC9p2OH1xREjbJaI9OpggxrL3c7 VooL5613hZkUusivnfNMsQXDiccCwPbUtzEAI85TlIlggl51/nigBZokbW6SHhChuZATzunC468 0Vw== X-Received: from iofm8-n2.prod.google.com ([2002:a05:6602:83c8:20b0:957:7451:a858]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:2910:b0:663:23a:caf6 with SMTP id 006d021491bc7-66d09ac270bmr2203902eaf.5.1770416924752; Fri, 06 Feb 2026 14:28:44 -0800 (PST) Date: Fri, 6 Feb 2026 22:28:29 +0000 In-Reply-To: <20260206222829.3758171-1-sagis@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260206222829.3758171-1-sagis@google.com> X-Mailer: git-send-email 2.53.0.rc2.204.g2597b5adb4-goog Message-ID: <20260206222829.3758171-3-sagis@google.com> Subject: [PATCH v3 2/2] KVM: SEV: Restrict userspace return codes for KVM_HC_MAP_GPA_RANGE From: Sagi Shahar To: Sean Christopherson , Paolo Bonzini , Dave Hansen , Kiryl Shutsemau , Rick Edgecombe Cc: Thomas Gleixner , Borislav Petkov , "H. Peter Anvin" , Michael Roth , Tom Lendacky , x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, Sagi Shahar Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To align with the updated TDX api that allows userspace to request that guests retry MAP_GPA operations, make sure that userspace is only returning EINVAL or EAGAIN as possible error codes. Signed-off-by: Sagi Shahar --- arch/x86/kvm/svm/sev.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index f59c65abe3cf..5f78e4c3eb5d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3722,9 +3722,13 @@ static int snp_rmptable_psmash(kvm_pfn_t pfn) =20 static int snp_complete_psc_msr(struct kvm_vcpu *vcpu) { + u64 hypercall_ret =3D READ_ONCE(vcpu->run->hypercall.ret); struct vcpu_svm *svm =3D to_svm(vcpu); =20 - if (vcpu->run->hypercall.ret) + if (!kvm_is_valid_map_gpa_range_ret(hypercall_ret)) + return -EINVAL; + + if (hypercall_ret) set_ghcb_msr(svm, GHCB_MSR_PSC_RESP_ERROR); else set_ghcb_msr(svm, GHCB_MSR_PSC_RESP); @@ -3815,10 +3819,14 @@ static void __snp_complete_one_psc(struct vcpu_svm = *svm) =20 static int snp_complete_one_psc(struct kvm_vcpu *vcpu) { + u64 hypercall_ret =3D READ_ONCE(vcpu->run->hypercall.ret); struct vcpu_svm *svm =3D to_svm(vcpu); struct psc_buffer *psc =3D svm->sev_es.ghcb_sa; =20 - if (vcpu->run->hypercall.ret) { + if (!kvm_is_valid_map_gpa_range_ret(hypercall_ret)) + return -EINVAL; + + if (hypercall_ret) { snp_complete_psc(svm, VMGEXIT_PSC_ERROR_GENERIC); return 1; /* resume guest */ } --=20 2.53.0.rc2.204.g2597b5adb4-goog