From d658e01cac98cfbc1e0edba4e8e564ba668a6e2f Mon Sep 17 00:00:00 2001 From: Rohit Vaswani Date: Thu, 17 Sep 2015 17:28:13 -0700 Subject: mm: Fix incorrect type conversion for size during dma allocation This was found during userspace fuzzing test when a large size allocation is made from ion [] 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 [] __dma_alloc_noncoherent+0xbc/0x19c [] ion_cma_allocate+0x178/0x2f0 [] ion_secure_cma_allocate+0xdc/0x190 [] ion_alloc+0x264/0xb88 [] ion_ioctl+0x1f4/0x480 [] do_vfs_ioctl+0x67c/0x764 [] SyS_ioctl+0x58/0x8c Change-Id: Idc9c19977a8cc62c7d092f689d30368704b400bc Signed-off-by: Rohit Vaswani --- drivers/base/dma-contiguous.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index e207b456d..4ca365fc7 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -700,7 +700,7 @@ err: * global one. Requires architecture specific get_dev_cma_area() helper * function. */ -struct page *dma_alloc_from_contiguous_org(struct device *dev, int count, +struct page *dma_alloc_from_contiguous_org(struct device *dev, size_t count, unsigned int align) { unsigned long mask, pfn, pageno, start = 0; -- cgit v1.2.3