From mboxrd@z Thu Jan 1 00:00:00 1970 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 9DC7C35B62C; Tue, 24 Feb 2026 22:34:23 +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=1771972463; cv=none; b=fjlnBSd6VN+J7+a5Ayw4DyPZvZcy9vk7FNMtr/GGyK7G9wQ5Cv1BewD+atUs3ShU04kcsJI9QTu/+V2Zf8ipzzl+4q3wRz/LP7CFCFI4PP7VgIzkdfhelE6B9g+n7N93flXiSvXx/QWTCIK2avmY+eGYrNbR7JglKfih0aiScYs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771972463; c=relaxed/simple; bh=Lf5SqEFhbFhXQTZaAcWAw6rxFcn0CcQDoxXm+TMCMvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tHtWvwFJWzV2aGoiPvkyFR7OhxmMaH4KXwlnAgYrkUQTTSdepXc4KW/+bfHBgpR3OIbAaAGEhQPmF4Rsqsbu9e/0JPOphd9YJx53KZlor2pjGYCu8F5yKL6hTn/z5dTRUB93aNrPZ47NTddwwuAm9K3t9JNx2hfDRcGbs3y/8LQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rACZK4IG; 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="rACZK4IG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38DBFC19423; Tue, 24 Feb 2026 22:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771972463; bh=Lf5SqEFhbFhXQTZaAcWAw6rxFcn0CcQDoxXm+TMCMvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rACZK4IGW5NpfpXH2dkv5x024becpOWb/6V3wK0U8bEFwvmy2Olj6w1hurKFiABc6 k9xgb8drnS49mtcDRveiFEFYyMXOtz9xxkV5J3vCUgR8JDHqH3Ge02QahICVqKRiqR wzVg/YYYqLb9nQOyc/ffzpPA/f9YIhTAwRJCtCvZ/s5jzJAs9/0X8jbCI+NvSw1T25 JMkYgkMEmOMPhx7nsgzaSViA1NS4soK5JaXnmKpeyz8P9KzWxAfRMiv4yOd/UPbdU6 Eb53d+k1PglUOcwhb5gzMiGFjberYTwsKjLuEJYivbHNST3DqSGhMmrmiQGG9trJ2c STEP5fdmdowDw== 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 v6 05/31] KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN Date: Tue, 24 Feb 2026 22:33:39 +0000 Message-ID: <20260224223405.3270433-6-yosry@kernel.org> X-Mailer: git-send-email 2.53.0.414.gf7e9f6c205-goog In-Reply-To: <20260224223405.3270433-1-yosry@kernel.org> References: <20260224223405.3270433-1-yosry@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 memory") 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 52d8536845927..fab0d3d5baa27 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) } vmcb12_gpa = svm->vmcb->save.rax; - ret = kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map); - if (ret == -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); } ret = kvm_skip_emulated_instruction(vcpu); -- 2.53.0.414.gf7e9f6c205-goog