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 0/8] KVM: x86: Emulator _regs fixes and cleanups
Date: Thu, 26 May 2022 21:08:09 +0000 [thread overview]
Message-ID: <20220526210817.3428868-1-seanjc@google.com> (raw)
Clean up and harden the use of the x86_emulate_ctxt._regs, which is
surrounded by a fair bit of magic. This series was prompted by bug reports
by Kees and Robert where GCC-12 flags an out-of-bounds _regs access. The
warning is a false positive due to a now-known GCC bug, but it's cheap and
easy to harden the _regs usage, and doing so minimizing the risk of more
precisely handling 32-bit vs. 64-bit GPRs.
I didn't tag patch 2 with Fixes or Cc: stable@. It does remedy the
GCC-12 warning, but AIUI the GCC-12 bug affects other KVM paths that
already have explicit guardrails, i.e. fixing this one case doesn't
guarantee happiness when building with CONFIG_KVM_WERROR=y, let alone
CONFIG_WERROR=y. That said, it might be worth sending to the v5.18 stable
tree[*] as it does appear to make some configs/setups happy.
[*] KVM hasn't changed, but the warning=>error was introduced in v5.18 by
commit e6148767825c ("Makefile: Enable -Warray-bounds").
v2:
- Collect reviews and tests. [Vitaly, Kees, Robert]
- Tweak patch 1's changelog to explicitly call out that dirty_regs is a
4 byte field. [Vitaly]
- Add Reported-by for Kees and Robert since this does technically fix a
build breakage.
- Use a raw literal for NR_EMULATOR_GPRS instead of VCPU_REGS_R15+1 to
play nice with 32-bit builds. [kernel test robot]
- Reduce the number of emulated GPRs to 8 for 32-bit builds.
- Add and use KVM_EMULATOR_BUG_ON() to bug/kill the VM when an emulator
bug is detected. [Vitaly]
v1: https://lore.kernel.org/all/20220525222604.2810054-1-seanjc@google.com
Sean Christopherson (8):
KVM: x86: Grab regs_dirty in local 'unsigned long'
KVM: x86: Harden _regs accesses to guard against buggy input
KVM: x86: Omit VCPU_REGS_RIP from emulator's _regs array
KVM: x86: Use 16-bit fields to track dirty/valid emulator GPRs
KVM: x86: Reduce the number of emulator GPRs to '8' for 32-bit KVM
KVM: x86: Bug the VM if the emulator accesses a non-existent GPR
KVM: x86: Bug the VM if the emulator generates a bogus exception
vector
KVM: x86: Bug the VM on an out-of-bounds data read
arch/x86/kvm/emulate.c | 26 ++++++++++++++++++++------
arch/x86/kvm/kvm_emulate.h | 28 +++++++++++++++++++++++++---
arch/x86/kvm/x86.c | 9 +++++++++
3 files changed, 54 insertions(+), 9 deletions(-)
base-commit: 90bde5bea810d766e7046bf5884f2ccf76dd78e9
--
2.36.1.255.ge46751e96f-goog
next 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 Sean Christopherson [this message]
2022-05-26 21:08 ` [PATCH v2 1/8] KVM: x86: Grab regs_dirty in local 'unsigned long' Sean Christopherson
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-1-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