dma-contiguous: do not overwrite align in dma_alloc_contiguous()
authorNicolin Chen <nicoleotsuka@gmail.com>
Fri, 26 Jul 2019 19:34:32 +0000 (12:34 -0700)
committerChristoph Hellwig <hch@lst.de>
Mon, 29 Jul 2019 06:50:04 +0000 (09:50 +0300)
commitc6622a425acd1d2f3a443cd39b490a8777b622d7
treea3a9ea952c439bf74ee1a243ffc3a6f73e4a3a9b
parent609488bc979f99f805f34e9a32c1e3b71179d10b
dma-contiguous: do not overwrite align in dma_alloc_contiguous()

The dma_alloc_contiguous() limits align at CONFIG_CMA_ALIGNMENT for
cma_alloc() however it does not restore it for the fallback routine.
This will result in a size mismatch between the allocation and free
when running into the fallback routines after cma_alloc() fails, if
the align is larger than CONFIG_CMA_ALIGNMENT.

This patch adds a cma_align to take care of cma_alloc() and prevent
the align from being overwritten.

Fixes: fdaeec198ada ("dma-contiguous: add dma_{alloc,free}_contiguous() helpers")
Reported-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
kernel/dma/contiguous.c