From nobody Thu Apr 2 06:27:04 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A75B6248861; Tue, 3 Mar 2026 00:34:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498073; cv=none; b=pMYLqG8oU+uiYINy3BBmi9cZdSZOnUNVpvPdRqKjgy/Kick/yHgLeC1itCi09XC5cNTsKKLhrxbGt2xJ2Bydx/Jj4tmkUp6lATjkCaLW6TECOW6D5HnY5jSJAYTDTtcIW54OFxE16ieKimByAmZJC0OR3m4sI9jYVqrnqN1tXQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498073; c=relaxed/simple; bh=f5x63EWl9Ak0ynSIx2o+WVCZCa048niPnvi+1XUeCCM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mweDhlMP/UlUr1hNhxMHY8BswPvc1oNhNPzj1vgP2dgqkd37dfbXrGPb9PWBtNQ10zO9TO2ORPGuh4QxyprnTl9EVVu4T3ReuZ9tJZ6WYCdrx2VsbIqjjsZFtGpAryI42USxhu2CDElgBCAq8WmpgOYpt70Yfy1+Sq9r4RCEiY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QWS4FnHg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QWS4FnHg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C9B7C2BCB2; Tue, 3 Mar 2026 00:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772498073; bh=f5x63EWl9Ak0ynSIx2o+WVCZCa048niPnvi+1XUeCCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QWS4FnHgln9XDzgMfLOIFRGNJTsuEjCWkTXmc8i7xz+If/GTEWEAxs1MMzFLfnzg9 7w0s5lrouxgCAOHOAOU3gyBUApDO7BT63T7Ne3HEcoH3DSXOoSYN3G2qtH3DLXUuUE UhqsJD7jVctmsssWLsiFYFAe7MF+sR7otqAhuJ3k1UxSisTzP6ZnWPCLy6dabQw1u6 j3yMQcuq5jXCU1TimL9M2UIiX0wsqFGExRMmxYMbBz/UOlAHnGQ211O6xLUUUDb0It um1zp2UiJYmi6FpE0TCN2XNdjzWvoHxuo17boVbsx9S6/Vm7YI0qgBtRMJpQu67B1b IBhQEiA9XvFdA== From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , stable@vger.kernel.org Subject: [PATCH v7 05/26] KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN Date: Tue, 3 Mar 2026 00:33:59 +0000 Message-ID: <20260303003421.2185681-6-yosry@kernel.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260303003421.2185681-1-yosry@kernel.org> References: <20260303003421.2185681-1-yosry@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" nested_svm_vmrun() currently only injects a #GP if kvm_vcpu_map() fails with -EINVAL. But it could also fail with -EFAULT if creating a host mapping failed. Inject a #GP in all cases, no reason to treat failure modes differently. Fixes: 8c5fbf1a7231 ("KVM/nSVM: Use the new mapping API for mapping guest m= emory") CC: stable@vger.kernel.org Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Signed-off-by: Yosry Ahmed --- arch/x86/kvm/svm/nested.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 3bf758c9cb85c..25f769a0d9a0d 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1011,12 +1011,9 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) } =20 vmcb12_gpa =3D svm->vmcb->save.rax; - ret =3D kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map); - if (ret =3D=3D -EINVAL) { + if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map)) { kvm_inject_gp(vcpu, 0); return 1; - } else if (ret) { - return kvm_skip_emulated_instruction(vcpu); } =20 ret =3D kvm_skip_emulated_instruction(vcpu); --=20 2.53.0.473.g4a7958ca14-goog