diff options
| author | John Snow <jsnow@redhat.com> | 2016-02-10 13:29:40 -0500 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-03-22 17:35:36 -0500 |
| commit | aaf4fb6afb4653c86059255811886a5c4ea271f3 (patch) | |
| tree | 9b83611ec5739c72e1cb5a0f9453ee61018cc8a9 | |
| parent | a2ae168821a5ef2b000a3e61837a77ba8cc43013 (diff) | |
| download | qemu-aaf4fb6afb4653c86059255811886a5c4ea271f3.zip qemu-aaf4fb6afb4653c86059255811886a5c4ea271f3.tar.gz qemu-aaf4fb6afb4653c86059255811886a5c4ea271f3.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
(cherry picked from commit 99b4cb71069f109b79b27bc629fc0cf0886dbc4b)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -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 dd1912e..d47ceeb 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -661,6 +661,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; @@ -677,6 +681,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; |