david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ahci: Do not unmap NULL addresses

Browse Source 
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
This commit is contained in:
John Snow 2016-02-10 13:29:40 -05:00
parent c691320faa
commit 99b4cb7106
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ide/ahci.c
View File

@ -662,6 +662,10 @@ static bool ahci_map_fis_address(AHCIDevice *ad)
static void ahci_unmap_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_memory_unmap(ad->hba->as, ad->res_fis, 256,
DMA_DIRECTION_FROM_DEVICE, 256); DMA_DIRECTION_FROM_DEVICE, 256);
ad->res_fis = NULL; ad->res_fis = NULL;
@ -678,6 +682,10 @@ static bool ahci_map_clb_address(AHCIDevice *ad)
static void ahci_unmap_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_memory_unmap(ad->hba->as, ad->lst, 1024,
DMA_DIRECTION_FROM_DEVICE, 1024); DMA_DIRECTION_FROM_DEVICE, 1024);
ad->lst = NULL; ad->lst = NULL;