diff options
| author | Rohit Vaswani <rvaswani@codeaurora.org> | 2015-10-22 13:32:11 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-03-25 17:32:32 +0000 |
| commit | cc12c0099168b416f6c3eff1cd560a771f4b7c3f (patch) | |
| tree | cc24bd8e641339b8422ade8af3d83c111bec8c9f /drivers/base | |
| parent | 96cbb7e99d66cef46c62dc691664d38d5ae2cd8d (diff) | |
| download | linux-cc12c0099168b416f6c3eff1cd560a771f4b7c3f.tar.gz linux-cc12c0099168b416f6c3eff1cd560a771f4b7c3f.tar.bz2 linux-cc12c0099168b416f6c3eff1cd560a771f4b7c3f.zip | |
mm: cma: fix incorrect type conversion for size during dma allocation
commit 67a2e213e7e937c41c52ab5bc46bf3f4de469f6e upstream.
This was found during userspace fuzzing test when a large size dma cma
allocation is made by driver(like ion) through userspace.
show_stack+0x10/0x1c
dump_stack+0x74/0xc8
kasan_report_error+0x2b0/0x408
kasan_report+0x34/0x40
__asan_storeN+0x15c/0x168
memset+0x20/0x44
__dma_alloc_coherent+0x114/0x18c
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.16: cma_alloc() does not exist so only
dma_alloc_from_contiguous() needs to be changed]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dma-contiguous.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 6467c919c509..8d6abb35ae55 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -313,7 +313,7 @@ static void clear_cma_bitmap(struct cma *cma, unsigned long pfn, int count) * global one. Requires architecture specific dev_get_cma_area() helper * function. */ -struct page *dma_alloc_from_contiguous(struct device *dev, int count, +struct page *dma_alloc_from_contiguous(struct device *dev, size_t count, unsigned int align) { unsigned long mask, pfn, pageno, start = 0; @@ -327,7 +327,7 @@ struct page *dma_alloc_from_contiguous(struct device *dev, int count, if (align > CONFIG_CMA_ALIGNMENT) align = CONFIG_CMA_ALIGNMENT; - pr_debug("%s(cma %p, count %d, align %d)\n", __func__, (void *)cma, + pr_debug("%s(cma %p, count %zu, align %d)\n", __func__, (void *)cma, count, align); if (!count) |