From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
syzbot+760a73552f47a8cd0fd9@syzkaller.appspotmail.com,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
Hou Wenlong <houwenlong.hwl@antgroup.com>
Subject: [PATCH 2/3] KVM: x86: Set error code to segment selector on LLDT/LTR non-canonical #GP
Date: Mon, 11 Jul 2022 23:27:49 +0000 [thread overview]
Message-ID: <20220711232750.1092012-3-seanjc@google.com> (raw)
In-Reply-To: <20220711232750.1092012-1-seanjc@google.com>
When injecting a #GP on LLDT/LTR due to a non-canonical LDT/TSS base, set
the error code to the selector. Intel SDM's says nothing about the #GP,
but AMD's APM explicitly states that both LLDT and LTR set the error code
to the selector, not zero.
Note, a non-canonical memory operand on LLDT/LTR does generate a #GP(0),
but the KVM code in question is specific to the base from the descriptor.
Fixes: e37a75a13cda ("KVM: x86: Emulator ignores LDTR/TR extended base on LLDT/LTR")
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/emulate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 09e4b67b881f..bd9e9c5627d0 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1736,8 +1736,8 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
if (ret != X86EMUL_CONTINUE)
return ret;
if (emul_is_noncanonical_address(get_desc_base(&seg_desc) |
- ((u64)base3 << 32), ctxt))
- return emulate_gp(ctxt, 0);
+ ((u64)base3 << 32), ctxt))
+ return emulate_gp(ctxt, err_code);
}
if (seg == VCPU_SREG_TR) {
--
2.37.0.144.g8ac04bfd2-goog
next prev parent reply other threads:[~2022-07-11 23:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 23:27 [PATCH 0/3] KVM: x86: Fix fault-related bugs in LTR/LLDT emulation Sean Christopherson
2022-07-11 23:27 ` [PATCH 1/3] KVM: x86: Mark TSS busy during LTR emulation _after_ all fault checks Sean Christopherson
2022-07-12 13:35 ` Maxim Levitsky
2022-07-12 17:29 ` Sean Christopherson
2022-07-11 23:27 ` Sean Christopherson [this message]
2022-07-12 13:37 ` [PATCH 2/3] KVM: x86: Set error code to segment selector on LLDT/LTR non-canonical #GP Maxim Levitsky
2022-07-12 17:31 ` Sean Christopherson
2022-07-11 23:27 ` [PATCH 3/3] KVM: x86: WARN only once if KVM leaves a dangling userspace I/O request Sean Christopherson
2022-07-12 13:34 ` Maxim Levitsky
2022-07-12 1:07 ` [PATCH 0/3] KVM: x86: Fix fault-related bugs in LTR/LLDT emulation Nadav Amit
2022-07-14 18:20 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220711232750.1092012-3-seanjc@google.com \
--to=seanjc@google.com \
--cc=houwenlong.hwl@antgroup.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=syzbot+760a73552f47a8cd0fd9@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox