From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPGnP-0000dS-GC for qemu-devel@nongnu.org; Fri, 29 Jan 2016 16:41:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPGnO-0008BR-Pe for qemu-devel@nongnu.org; Fri, 29 Jan 2016 16:41:35 -0500 From: John Snow Date: Fri, 29 Jan 2016 16:41:26 -0500 Message-Id: <1454103689-13042-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1454103689-13042-1-git-send-email-jsnow@redhat.com> References: <1454103689-13042-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] ahci: Do not unmap NULL addresses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: peter.maydell@linaro.org, pjp@fedoraproject.org, qemu-devel@nongnu.org, zuozhi.fzz@alibaba-inc.com, pbonzini@redhat.com, John Snow Definitely don't try to unmap a garbage address. Reported-by: Zuozhi fzz Signed-off-by: John Snow --- hw/ide/ahci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 17f1cbd..cdc9299 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; -- 2.4.3