summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-05-17 16:37:59 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-05-22 09:45:56 +0200
commitabd9a0c36028771a8f397f38bf79bfcf404f957f (patch)
tree4c05aa888c674b1caef7d3ef5afa7a53e4fb1d40
parentMerge branch 'leds-fixes-3.10' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-abd9a0c36028771a8f397f38bf79bfcf404f957f.tar.xz
linux-abd9a0c36028771a8f397f38bf79bfcf404f957f.zip
s390/dma: do not call debug_dma after free
In dma_free_coherent call debug_dma_free_coherent before deallocating the memory to avoid a possible use after free. Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/dma-mapping.h b/arch/s390/include/asm/dma-mapping.h
index 9411db653bac..886ac7d4937a 100644
--- a/arch/s390/include/asm/dma-mapping.h
+++ b/arch/s390/include/asm/dma-mapping.h
@@ -71,8 +71,8 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
{
struct dma_map_ops *dma_ops = get_dma_ops(dev);
- dma_ops->free(dev, size, cpu_addr, dma_handle, NULL);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
+ dma_ops->free(dev, size, cpu_addr, dma_handle, NULL);
}
#endif /* _ASM_S390_DMA_MAPPING_H */