Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp216939pxx; Wed, 28 Oct 2020 03:07:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTUmM17imhShFvbGuQellFDHYE16LglBS1SPeHuFkyIGUwV+cw8Krz2ZFjHQSXRCdfGtkz X-Received: by 2002:a05:6402:1684:: with SMTP id a4mr6724695edv.79.1603879632197; Wed, 28 Oct 2020 03:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603879632; cv=none; d=google.com; s=arc-20160816; b=et0U0WaBfWQfYJlZlfRKxjHlM5Tuo714F5ZdbH5SLjzqeRvNiMXakul/H82m1hPOPP jYWxnn+qLSfrNtuzjpvJdVYVnpKYFgPsaQpojOc91CGXZ/LzaeOrfJOoFAc4zd6JMPwd yniKyEbKbIFoa72/BufJZm3frVwGGF/DPFh96ffkc8vfDVNMQtNj1kkAMZrjzGtFXw81 vLOH7qqfyOl3oLBYiNrhTHpNX+S8O+e4UJZICDIV/MV30/HrTsA7KbKTbu4xEFHFczWw 8uj6BnNacMLaPtsD01KbMfb2h32S8oRWWvlau2897sbSXVZ8TdJvzJQ4zzB578fhgnLi t85Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ApSFts7yCcNagdNl69S/KeFCQspMdR+zGGjDJHdpYyo=; b=hYMZh1Dfi5HSirNnSwQLq1Il30yyauN/JlZ2iCFYGdvgEnipyzHf7OvzkffHNmqshu LKepbaDVv8sB490dyG3ICCivMRrTkDYZ7e/Ri6COsAqBw4Q9qOT3JZ3RLxXpQhV4OcMo RaMJTUogysQe3XA8LTqMs38bqNR7e+1WfxiobMwpNzj1pt9nlsNvOKtrOgDh/EpFVxF8 dHiAqJnv+2orFaWcq9vMNB8s0xTloyHj4NLm5dDu0SkXrAcotKaOahuKb/W3iPX/cClw KakfDThtfY1Wx4o38X3fND2r55RasW1DEEHCoY12neoKvFBbTMz5J9qSQotVrUUNzQNh qBPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dSql1RQq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l12si2820211edk.163.2020.10.28.03.06.49; Wed, 28 Oct 2020 03:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dSql1RQq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760190AbgJ0Ody (ORCPT + 99 others); Tue, 27 Oct 2020 10:33:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:58790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2902276AbgJ0Ob6 (ORCPT ); Tue, 27 Oct 2020 10:31:58 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C124322202; Tue, 27 Oct 2020 14:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809117; bh=M3ekqsXBn+v4P1xcAb0qfTmejvwXG/Ppx5WAXyI3lJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dSql1RQqNlwYqxYWdsByLa2Qi9wWd/FZx/9OWx9cJsMNX99gNrRPQPH/PcxYEnHlj LTJUHIlKdAPb6cYdmtY5ram8QC1i/WSzodVbvo9O8EmeBY4zQbUy3FCbWhKRwGNgMb +wzUiIieP/7YIXOy7SPdqYkTgKvPGJ+E6K78wpE0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Suravee Suthikulpanit , Paolo Bonzini Subject: [PATCH 5.4 051/408] KVM: SVM: Initialize prev_ga_tag before use Date: Tue, 27 Oct 2020 14:49:49 +0100 Message-Id: <20201027135457.436925811@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit commit f6426ab9c957e97418ac5b0466538792767b1738 upstream. The function amd_ir_set_vcpu_affinity makes use of the parameter struct amd_iommu_pi_data.prev_ga_tag to determine if it should delete struct amd_iommu_pi_data from a list when not running in AVIC mode. However, prev_ga_tag is initialized only when AVIC is enabled. The non-zero uninitialized value can cause unintended code path, which ends up making use of the struct vcpu_svm.ir_list and ir_list_lock without being initialized (since they are intended only for the AVIC case). This triggers NULL pointer dereference bug in the function vm_ir_list_del with the following call trace: svm_update_pi_irte+0x3c2/0x550 [kvm_amd] ? proc_create_single_data+0x41/0x50 kvm_arch_irq_bypass_add_producer+0x40/0x60 [kvm] __connect+0x5f/0xb0 [irqbypass] irq_bypass_register_producer+0xf8/0x120 [irqbypass] vfio_msi_set_vector_signal+0x1de/0x2d0 [vfio_pci] vfio_msi_set_block+0x77/0xe0 [vfio_pci] vfio_pci_set_msi_trigger+0x25c/0x2f0 [vfio_pci] vfio_pci_set_irqs_ioctl+0x88/0xb0 [vfio_pci] vfio_pci_ioctl+0x2ea/0xed0 [vfio_pci] ? alloc_file_pseudo+0xa5/0x100 vfio_device_fops_unl_ioctl+0x26/0x30 [vfio] ? vfio_device_fops_unl_ioctl+0x26/0x30 [vfio] __x64_sys_ioctl+0x96/0xd0 do_syscall_64+0x37/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Therefore, initialize prev_ga_tag to zero before use. This should be safe because ga_tag value 0 is invalid (see function avic_vm_init). Fixes: dfa20099e26e ("KVM: SVM: Refactor AVIC vcpu initialization into avic_init_vcpu()") Signed-off-by: Suravee Suthikulpanit Message-Id: <20201003232707.4662-1-suravee.suthikulpanit@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -5383,6 +5383,7 @@ static int svm_update_pi_irte(struct kvm * - Tell IOMMU to use legacy mode for this interrupt. * - Retrieve ga_tag of prior interrupt remapping data. */ + pi.prev_ga_tag = 0; pi.is_guest_mode = false; ret = irq_set_vcpu_affinity(host_irq, &pi);