linux-kernel - [PATCH] dma-mapping.h: Preserve unmap info for CONFIG_DMA_API

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1474387125-3713-1-git-send-email-andrew.smirnov@gmail.com>
Date:   Tue, 20 Sep 2016 08:58:45 -0700
From:   Andrey Smirnov <andrew.smirnov@...il.com>
To:     linux-kernel@...r.kernel.org
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Robin Murphy <Robin.Murphy@....com>,
        Joerg Roedel <jroedel@...e.de>,
        Will Deacon <will.deacon@....com>,
        Zhen Lei <thunder.leizhen@...wei.com>,
        "Luis R. Rodriguez" <mcgrof@...e.com>,
        Christian Borntraeger <borntraeger@...ibm.com>,
        Geliang Tang <geliangtang@....com>,
        Andrey Smirnov <andrew.smirnov@...il.com>
Subject: [PATCH] dma-mapping.h: Preserve unmap info for CONFIG_DMA_API_DEBUG

When CONFIG_DMA_API_DEBUG is enabled we need to preserve unmapping
address even if "unmap" is a no-op for our architecutre because we need
debug_dma_unmap_page() to correctly cleanup all of the debug
bookkeeping. Failing to do so results in a false positive warnings about
previously mapped areas never being unmapped.

Signed-off-by: Andrey Smirnov <andrew.smirnov@...il.com>
---
 include/linux/dma-mapping.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 71c1b21..41c9875 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -678,7 +678,7 @@ static inline int dma_mmap_wc(struct device *dev,
 #define dma_mmap_writecombine dma_mmap_wc
 #endif
 
-#ifdef CONFIG_NEED_DMA_MAP_STATE
+#if defined(CONFIG_NEED_DMA_MAP_STATE) || defined(CONFIG_DMA_API_DEBUG)
 #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME)        dma_addr_t ADDR_NAME
 #define DEFINE_DMA_UNMAP_LEN(LEN_NAME)          __u32 LEN_NAME
 #define dma_unmap_addr(PTR, ADDR_NAME)           ((PTR)->ADDR_NAME)
-- 
2.5.5