From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: stable@vger.kernel.org,
Ben Hutchings <ben.hutchings@codethink.co.uk>,
Sasha Levin <sashal@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org,
Tobias Urdin <tobias.urdin@binero.com>
Subject: Re: [PATCH 4.19 STABLE 2/2] KVM: VMX: Mark RCX, RDX and RSI as clobbered in vmx_vcpu_run()'s asm blob
Date: Tue, 5 May 2020 08:15:02 +0200 [thread overview]
Message-ID: <20200505061502.GA3874653@kroah.com> (raw)
In-Reply-To: <20200505012348.17099-3-sean.j.christopherson@intel.com>
On Mon, May 04, 2020 at 06:23:48PM -0700, Sean Christopherson wrote:
> Save RCX, RDX and RSI to fake outputs to coerce the compiler into
> treating them as clobbered. RCX in particular is likely to be reused by
> the compiler to dereference the 'struct vcpu_vmx' pointer, which will
> result in a null pointer dereference now that RCX is zeroed by the asm
> blob.
>
> Add ASM_CALL_CONSTRAINT to fudge around an issue where <something>
> during modpost can't find vmx_return when specifying output constraints.
>
> Reported-by: Tobias Urdin <tobias.urdin@binero.com>
> Fixes: b4be98039a92 ("KVM: VMX: Zero out *all* general purpose registers after VM-Exit")
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
> arch/x86/kvm/vmx.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 5b06a98ffd4c..54c8b4dc750d 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -10882,7 +10882,8 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
> ".global vmx_return \n\t"
> "vmx_return: " _ASM_PTR " 2b \n\t"
> ".popsection"
> - : : "c"(vmx), "d"((unsigned long)HOST_RSP), "S"(evmcs_rsp),
> + : ASM_CALL_CONSTRAINT, "=c"((int){0}), "=d"((int){0}), "=S"((int){0})
> + : "c"(vmx), "d"((unsigned long)HOST_RSP), "S"(evmcs_rsp),
> [launched]"i"(offsetof(struct vcpu_vmx, __launched)),
> [fail]"i"(offsetof(struct vcpu_vmx, fail)),
> [host_rsp]"i"(offsetof(struct vcpu_vmx, host_rsp)),
> --
> 2.26.0
>
What is the git commit id of this patch in Linus's tree?
thanks,
greg k-h
next prev parent reply other threads:[~2020-05-05 6:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 1:23 [PATCH 4.19 STABLE 0/2] KVM: VMX: Fix null pointer dereference Sean Christopherson
2020-05-05 1:23 ` [PATCH 4.19 STABLE 1/2] KVM: VMX: Explicitly reference RCX as the vmx_vcpu pointer in asm blobs Sean Christopherson
2020-05-05 1:23 ` [PATCH 4.19 STABLE 2/2] KVM: VMX: Mark RCX, RDX and RSI as clobbered in vmx_vcpu_run()'s asm blob Sean Christopherson
2020-05-05 6:15 ` Greg Kroah-Hartman [this message]
2020-05-05 6:27 ` Sean Christopherson
2020-05-05 7:02 ` Greg Kroah-Hartman
2020-05-05 14:37 ` 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=20200505061502.GA3874653@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=ben.hutchings@codethink.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sashal@kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=stable@vger.kernel.org \
--cc=tobias.urdin@binero.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;
as well as URLs for NNTP newsgroup(s).