From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Kees Cook <keescook@chromium.org>,
Robert Dinse <nanook@eskimo.com>
Subject: [PATCH v2 1/8] KVM: x86: Grab regs_dirty in local 'unsigned long'
Date: Thu, 26 May 2022 21:08:10 +0000 [thread overview]
Message-ID: <20220526210817.3428868-2-seanjc@google.com> (raw)
In-Reply-To: <20220526210817.3428868-1-seanjc@google.com>
Capture ctxt->regs_dirty in a local 'unsigned long' instead of casting it
to an 'unsigned long *' for use in for_each_set_bit(). The bitops helpers
really do read the entire 'unsigned long', even though the walking of the
read value is capped at the specified size. I.e. 64-bit KVM is reading
memory beyond ctxt->regs_dirty, which is a u32 and thus 4 bytes, whereas
an unsigned long is 8 bytes. Functionally it's not an issue because
regs_dirty is in the middle of x86_emulate_ctxt, i.e. KVM is just reading
its own memory, but relying on that coincidence is gross and unsafe.
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/emulate.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 89b11e7dca8a..7226a127ccb4 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -269,9 +269,10 @@ static ulong *reg_rmw(struct x86_emulate_ctxt *ctxt, unsigned nr)
static void writeback_registers(struct x86_emulate_ctxt *ctxt)
{
+ unsigned long dirty = ctxt->regs_dirty;
unsigned reg;
- for_each_set_bit(reg, (ulong *)&ctxt->regs_dirty, 16)
+ for_each_set_bit(reg, &dirty, 16)
ctxt->ops->write_gpr(ctxt, reg, ctxt->_regs[reg]);
}
--
2.36.1.255.ge46751e96f-goog
next prev parent reply other threads:[~2022-05-26 21:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 21:08 [PATCH v2 0/8] KVM: x86: Emulator _regs fixes and cleanups Sean Christopherson
2022-05-26 21:08 ` Sean Christopherson [this message]
2022-05-26 21:08 ` [PATCH v2 2/8] KVM: x86: Harden _regs accesses to guard against buggy input Sean Christopherson
2022-05-26 21:08 ` [PATCH v2 3/8] KVM: x86: Omit VCPU_REGS_RIP from emulator's _regs array Sean Christopherson
2022-05-31 18:04 ` Kees Cook
2022-05-26 21:08 ` [PATCH v2 4/8] KVM: x86: Use 16-bit fields to track dirty/valid emulator GPRs Sean Christopherson
2022-05-26 21:08 ` [PATCH v2 5/8] KVM: x86: Reduce the number of emulator GPRs to '8' for 32-bit KVM Sean Christopherson
2022-05-31 18:04 ` Kees Cook
2022-05-26 21:08 ` [PATCH v2 6/8] KVM: x86: Bug the VM if the emulator accesses a non-existent GPR Sean Christopherson
2022-05-31 18:06 ` Kees Cook
2022-06-01 8:29 ` Vitaly Kuznetsov
2022-06-02 16:01 ` Sean Christopherson
2022-05-26 21:08 ` [PATCH v2 7/8] KVM: x86: Bug the VM if the emulator generates a bogus exception vector Sean Christopherson
2022-05-31 18:06 ` Kees Cook
2022-06-01 8:31 ` Vitaly Kuznetsov
2022-05-26 21:08 ` [PATCH v2 8/8] KVM: x86: Bug the VM on an out-of-bounds data read Sean Christopherson
2022-05-31 18:06 ` Kees Cook
2022-06-01 8:39 ` Vitaly Kuznetsov
2022-05-26 23:14 ` [PATCH v2 0/8] KVM: x86: Emulator _regs fixes and cleanups Robert Dinse
2022-06-08 12:23 ` Paolo Bonzini
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=20220526210817.3428868-2-seanjc@google.com \
--to=seanjc@google.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nanook@eskimo.com \
--cc=pbonzini@redhat.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.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