From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wj17n-0004aI-Fq for qemu-devel@nongnu.org; Sat, 10 May 2014 02:51:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wj17h-0002A6-T7 for qemu-devel@nongnu.org; Sat, 10 May 2014 02:51:11 -0400 Received: from mail-ee0-x22b.google.com ([2a00:1450:4013:c00::22b]:37892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wj17h-0002A0-MB for qemu-devel@nongnu.org; Sat, 10 May 2014 02:51:05 -0400 Received: by mail-ee0-f43.google.com with SMTP id d17so3136328eek.16 for ; Fri, 09 May 2014 23:51:04 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 10 May 2014 08:50:47 +0200 Message-Id: <1399704652-6827-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1399704652-6827-1-git-send-email-pbonzini@redhat.com> References: <1399704652-6827-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 3/8] pci-assign: Fix a bug when map MSI-X table memory failed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei From: Gonglei when map MSI-X table memory failed, the dev->msix_table not be set to NULL, the assigned_dev_unregister_msix_mmio() will case a segfault when munmap the failed dev->msix_table. Signed-off-by: Gonglei Arei Reviewed-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/i386/kvm/pci-assign.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index a825871..570333f 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -1608,6 +1608,7 @@ static int assigned_dev_register_msix_mmio(AssignedDevice *dev) MAP_ANONYMOUS|MAP_PRIVATE, 0, 0); if (dev->msix_table == MAP_FAILED) { error_report("fail allocate msix_table! %s", strerror(errno)); + dev->msix_table = NULL; return -EFAULT; } -- 1.8.3.1