]> git.proxmox.com Git - mirror_qemu.git/commitdiff
ahci: Do not unmap NULL addresses
authorJohn Snow <jsnow@redhat.com>
Wed, 10 Feb 2016 18:29:40 +0000 (13:29 -0500)
committerJohn Snow <jsnow@redhat.com>
Wed, 10 Feb 2016 18:29:40 +0000 (13:29 -0500)
Definitely don't try to unmap a garbage address.

Reported-by: Zuozhi fzz <zuozhi.fzz@alibaba-inc.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1454103689-13042-2-git-send-email-jsnow@redhat.com

hw/ide/ahci.c

index 7e87b1805ecd05494418c102cf912ae33ddd2cab..3a95dadbd6df8ff7298b859a74384836da2a2b84 100644 (file)
@@ -662,6 +662,10 @@ static bool ahci_map_fis_address(AHCIDevice *ad)
 
 static void ahci_unmap_fis_address(AHCIDevice *ad)
 {
+    if (ad->res_fis == NULL) {
+        DPRINTF(ad->port_no, "Attempt to unmap NULL FIS address\n");
+        return;
+    }
     dma_memory_unmap(ad->hba->as, ad->res_fis, 256,
                      DMA_DIRECTION_FROM_DEVICE, 256);
     ad->res_fis = NULL;
@@ -678,6 +682,10 @@ static bool ahci_map_clb_address(AHCIDevice *ad)
 
 static void ahci_unmap_clb_address(AHCIDevice *ad)
 {
+    if (ad->lst == NULL) {
+        DPRINTF(ad->port_no, "Attempt to unmap NULL CLB address\n");
+        return;
+    }
     dma_memory_unmap(ad->hba->as, ad->lst, 1024,
                      DMA_DIRECTION_FROM_DEVICE, 1024);
     ad->lst = NULL;