Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1506144 > unrolled thread
| Started by | Ido Yariv <ido@wizery.com> |
|---|---|
| First post | 2016-10-21 18:50 +0200 |
| Last post | 2016-10-24 17:30 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] KVM: x86: fix wbinvd_dirty_mask use-after-free Ido Yariv <ido@wizery.com> - 2016-10-21 18:50 +0200
Re: [PATCH] KVM: x86: fix wbinvd_dirty_mask use-after-free Paolo Bonzini <pbonzini@redhat.com> - 2016-10-24 16:20 +0200
Re: [PATCH] KVM: x86: fix wbinvd_dirty_mask use-after-free Radim Krčmář <rkrcmar@redhat.com> - 2016-10-24 17:30 +0200
| From | Ido Yariv <ido@wizery.com> |
|---|---|
| Date | 2016-10-21 18:50 +0200 |
| Subject | [PATCH] KVM: x86: fix wbinvd_dirty_mask use-after-free |
| Message-ID | <suLb4-8f6-39@gated-at.bofh.it> |
vcpu->arch.wbinvd_dirty_mask may still be used after freeing it,
corrupting memory. For example, the following call trace may set a bit
in an already freed cpu mask:
kvm_arch_vcpu_load
vcpu_load
vmx_free_vcpu_nested
vmx_free_vcpu
kvm_arch_vcpu_free
Fix this by deferring freeing of wbinvd_dirty_mask.
Cc: stable@vger.kernel.org
Signed-off-by: Ido Yariv <ido@wizery.com>
---
arch/x86/kvm/x86.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6c633de..9ec8c1d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7410,10 +7410,12 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)
void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
{
+ void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask;
+
kvmclock_reset(vcpu);
- free_cpumask_var(vcpu->arch.wbinvd_dirty_mask);
kvm_x86_ops->vcpu_free(vcpu);
+ free_cpumask_var(wbinvd_dirty_mask);
}
struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
--
2.5.5
[toc] | [next] | [standalone]
| From | Paolo Bonzini <pbonzini@redhat.com> |
|---|---|
| Date | 2016-10-24 16:20 +0200 |
| Message-ID | <svOgx-f0-1@gated-at.bofh.it> |
| In reply to | #1506144 |
On 21/10/2016 18:39, Ido Yariv wrote:
> vcpu->arch.wbinvd_dirty_mask may still be used after freeing it,
> corrupting memory. For example, the following call trace may set a bit
> in an already freed cpu mask:
> kvm_arch_vcpu_load
> vcpu_load
> vmx_free_vcpu_nested
> vmx_free_vcpu
> kvm_arch_vcpu_free
>
> Fix this by deferring freeing of wbinvd_dirty_mask.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Ido Yariv <ido@wizery.com>
> ---
> arch/x86/kvm/x86.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 6c633de..9ec8c1d 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7410,10 +7410,12 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)
>
> void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
> {
> + void *wbinvd_dirty_mask = vcpu->arch.wbinvd_dirty_mask;
> +
> kvmclock_reset(vcpu);
>
> - free_cpumask_var(vcpu->arch.wbinvd_dirty_mask);
> kvm_x86_ops->vcpu_free(vcpu);
> + free_cpumask_var(wbinvd_dirty_mask);
> }
>
> struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
[toc] | [prev] | [next] | [standalone]
| From | Radim Krčmář <rkrcmar@redhat.com> |
|---|---|
| Date | 2016-10-24 17:30 +0200 |
| Message-ID | <svPmi-ZI-37@gated-at.bofh.it> |
| In reply to | #1506144 |
2016-10-21 12:39-0400, Ido Yariv: > vcpu->arch.wbinvd_dirty_mask may still be used after freeing it, > corrupting memory. For example, the following call trace may set a bit > in an already freed cpu mask: > kvm_arch_vcpu_load > vcpu_load > vmx_free_vcpu_nested > vmx_free_vcpu > kvm_arch_vcpu_free > > Fix this by deferring freeing of wbinvd_dirty_mask. > > Cc: stable@vger.kernel.org > Signed-off-by: Ido Yariv <ido@wizery.com> > --- Applied, thanks.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web