Skip to content

Commit

Permalink
dma-direct: check for overflows on 32 bit DMA addresses
Browse files Browse the repository at this point in the history
commit b12d662 upstream.

As seen on the new Raspberry Pi 4 and sta2x11's DMA implementation it is
possible for a device configured with 32 bit DMA addresses and a partial
DMA mapping located at the end of the address space to overflow. It
happens when a higher physical address, not DMAable, is translated to
it's DMA counterpart.

For example the Raspberry Pi 4, configurable up to 4 GB of memory, has
an interconnect capable of addressing the lower 1 GB of physical memory
with a DMA offset of 0xc0000000. It transpires that, any attempt to
translate physical addresses higher than the first GB will result in an
overflow which dma_capable() can't detect as it only checks for
addresses bigger then the maximum allowed DMA address.

Fix this by verifying in dma_capable() if the DMA address range provided
is at any point lower than the minimum possible DMA address on the bus.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Nicolas Saenz Julienne authored and pelwell committed Mar 11, 2020
1 parent 9ae8046 commit 1f4b405
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/linux/dma-direct.h
Expand Up @@ -6,7 +6,7 @@
#include <linux/memblock.h> /* for min_low_pfn */
#include <linux/mem_encrypt.h>

extern unsigned int zone_dma_bits;
static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);

#ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
#include <asm/dma-direct.h>
Expand Down

0 comments on commit 1f4b405

Please sign in to comment.