diff options
| author | John Snow <jsnow@redhat.com> | 2016-02-10 13:29:40 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2016-02-10 13:29:40 -0500 |
| commit | 99b4cb71069f109b79b27bc629fc0cf0886dbc4b (patch) | |
| tree | dda90b81fa858dda59933b3b4929265bb08c9b91 /hw/ide | |
| parent | c691320faa6a1749042134716a628e22abb81ed2 (diff) | |
| download | qemu-99b4cb71069f109b79b27bc629fc0cf0886dbc4b.zip qemu-99b4cb71069f109b79b27bc629fc0cf0886dbc4b.tar.gz qemu-99b4cb71069f109b79b27bc629fc0cf0886dbc4b.tar.bz2 | |
ahci: Do not unmap NULL addresses
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
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/ahci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 7e87b18..3a95dad 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -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; |