public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Kees Cook <keescook@chromium.org>
Cc: Paolo Bonzini <pbonzini@redhat.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,
	Robert Dinse <nanook@eskimo.com>
Subject: Re: [PATCH 2/4] KVM: x86: Harden _regs accesses to guard against buggy input
Date: Thu, 26 May 2022 16:01:32 +0000	[thread overview]
Message-ID: <Yo+kXEKYAdduOAZX@google.com> (raw)
In-Reply-To: <202205260835.9BC23703@keescook>

On Thu, May 26, 2022, Kees Cook wrote:
> On Wed, May 25, 2022 at 10:26:02PM +0000, Sean Christopherson wrote:
> > Link: https://lore.kernel.org/all/YofQlBrlx18J7h9Y@google.com
> > Cc: Robert Dinse <nanook@eskimo.com>
> > Cc: Kees Cook <keescook@chromium.org>
> > Signed-off-by: Sean Christopherson <seanjc@google.com>
> > ---
> >  arch/x86/kvm/emulate.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> > index 7226a127ccb4..c58366ae4da2 100644
> > --- a/arch/x86/kvm/emulate.c
> > +++ b/arch/x86/kvm/emulate.c
> > @@ -247,6 +247,9 @@ enum x86_transfer_type {
> >  
> >  static ulong reg_read(struct x86_emulate_ctxt *ctxt, unsigned nr)
> >  {
> > +	if (WARN_ON_ONCE(nr >= 16))
> > +		nr &= 16 - 1;
> 
> Instead of doing a modulo here, what about forcing it into an "unused"
> slot?
> 
> i.e. define _regs as an array of [16 + 1], and:
> 
> 	if (WARN_ON_ONCE(nr >= 16)
> 		nr = 16;
> 
> Then there is both no out-of-bounds access, but also no weird "actual"
> register indexed?

Eh, IMO it doesn't provide any meaningful value, and requires documenting why
the emulator allocates an extra register.

The guest is still going to experience data loss/corruption if KVM drops a write
or reads zeros instead whatever register it was supposed to access.  I.e. the
guest is equally hosed either way.

One idea along the lines of Vitaly's idea of KVM_BUG_ON() would be to add an
emulator hook to bug the VM, e.g.

#define KVM_EMULATOR_BUG_ON(cond, ctxt)				\
({								\
	int __ret = (cond);					\
								\
	if (WARN_ON_ONCE(__ret))				\
		ctxt->ops->vm_bugged(ctxt);			\
	unlikely(__ret);					\
})

to workaround not having access to the 'struct kvm_vcpu' in the emulator.  The
bad access will still go through, but the VM will be killed before the vCPU can
re-enter the guest and do more damage.

  reply	other threads:[~2022-05-26 16:01 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 22:26 [PATCH 0/4] KVM: x86: Emulator _regs fixes and cleanups Sean Christopherson
2022-05-25 22:26 ` [PATCH 1/4] KVM: x86: Grab regs_dirty in local 'unsigned long' Sean Christopherson
2022-05-26 14:04   ` Vitaly Kuznetsov
2022-05-26 15:33   ` Kees Cook
2022-05-25 22:26 ` [PATCH 2/4] KVM: x86: Harden _regs accesses to guard against buggy input Sean Christopherson
2022-05-26 14:07   ` Vitaly Kuznetsov
2022-05-26 15:49     ` Sean Christopherson
2022-05-26 15:58       ` Vitaly Kuznetsov
2022-05-26 15:39   ` Kees Cook
2022-05-26 16:01     ` Sean Christopherson [this message]
2022-05-25 22:26 ` [PATCH 3/4] KVM: x86: Omit VCPU_REGS_RIP from emulator's _regs array Sean Christopherson
2022-05-26  2:55   ` kernel test robot
2022-05-26 15:47     ` Sean Christopherson
2022-05-25 22:26 ` [PATCH 4/4] KVM: x86: Use 16-bit fields to track dirty/valid emulator GPRs Sean Christopherson
2022-05-26 15:41   ` Kees Cook
2022-05-26  1:48 ` [PATCH 0/4] KVM: x86: Emulator _regs fixes and cleanups Robert Dinse

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=Yo+kXEKYAdduOAZX@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