diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-12-14 09:00:40 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-20 08:13:52 +0100 |
| commit | 518a2f1925c3165befbf06b75e07636549d92c1c (patch) | |
| tree | 629130481205f514709c3cc84a2f5debed28f8cd /arch/alpha | |
| parent | sparc/iommu: fix ->map_sg return value (diff) | |
| download | linux-dev-518a2f1925c3165befbf06b75e07636549d92c1c.tar.xz linux-dev-518a2f1925c3165befbf06b75e07636549d92c1c.zip | |
dma-mapping: zero memory returned from dma_alloc_*
If we want to map memory from the DMA allocator to userspace it must be
zeroed at allocation time to prevent stale data leaks. We already do
this on most common architectures, but some architectures don't do this
yet, fix them up, either by passing GFP_ZERO when we use the normal page
allocator or doing a manual memset otherwise.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> [m68k]
Acked-by: Sam Ravnborg <sam@ravnborg.org> [sparc]
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/pci_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index e1716e0d92fd..aa0f50d0f823 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -443,7 +443,7 @@ static void *alpha_pci_alloc_coherent(struct device *dev, size_t size, gfp &= ~GFP_DMA; try_again: - cpu_addr = (void *)__get_free_pages(gfp, order); + cpu_addr = (void *)__get_free_pages(gfp | __GFP_ZERO, order); if (! cpu_addr) { printk(KERN_INFO "pci_alloc_consistent: " "get_free_pages failed from %pf\n", |