lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <f7b8ca30-21fa-5268-7f17-889f10b90187@redhat.com>
Date:   Fri, 17 Apr 2020 17:06:10 +0200
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Jon Cargille <jcargill@...gle.com>,
        Sean Christopherson <sean.j.christopherson@...el.com>,
        Vitaly Kuznetsov <vkuznets@...hat.com>,
        Wanpeng Li <wanpengli@...cent.com>,
        Jim Mattson <jmattson@...gle.com>,
        Joerg Roedel <joro@...tes.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
        "H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
        kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Steve Rutherford <srutherford@...gle.com>
Subject: Re: [PATCH] KVM: Remove CREATE_IRQCHIP/SET_PIT2 race

On 16/04/20 21:11, Jon Cargille wrote:
> From: Steve Rutherford <srutherford@...gle.com>
> 
> Fixes a NULL pointer dereference, caused by the PIT firing an interrupt
> before the interrupt table has been initialized.
> 
> SET_PIT2 can race with the creation of the IRQchip. In particular,
> if SET_PIT2 is called with a low PIT timer period (after the creation of
> the IOAPIC, but before the instantiation of the irq routes), the PIT can
> fire an interrupt at an uninitialized table.
> 
> Signed-off-by: Steve Rutherford <srutherford@...gle.com>
> Signed-off-by: Jon Cargille <jcargill@...gle.com>
> Reviewed-by: Jim Mattson <jmattson@...gle.com>
> ---
>  arch/x86/kvm/x86.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 027dfd278a973..3cc3f673785c8 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -5049,10 +5049,13 @@ long kvm_arch_vm_ioctl(struct file *filp,
>  		r = -EFAULT;
>  		if (copy_from_user(&u.ps, argp, sizeof(u.ps)))
>  			goto out;
> +		mutex_lock(&kvm->lock);
>  		r = -ENXIO;
>  		if (!kvm->arch.vpit)
> -			goto out;
> +			goto set_pit_out;
>  		r = kvm_vm_ioctl_set_pit(kvm, &u.ps);
> +set_pit_out:
> +		mutex_unlock(&kvm->lock);
>  		break;
>  	}
>  	case KVM_GET_PIT2: {
> @@ -5072,10 +5075,13 @@ long kvm_arch_vm_ioctl(struct file *filp,
>  		r = -EFAULT;
>  		if (copy_from_user(&u.ps2, argp, sizeof(u.ps2)))
>  			goto out;
> +		mutex_lock(&kvm->lock);
>  		r = -ENXIO;
>  		if (!kvm->arch.vpit)
> -			goto out;
> +			goto set_pit2_out;
>  		r = kvm_vm_ioctl_set_pit2(kvm, &u.ps2);
> +set_pit2_out:
> +		mutex_unlock(&kvm->lock);
>  		break;
>  	}
>  	case KVM_REINJECT_CONTROL: {
> 

Queued, thanks.

Paolo

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ