nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mm: cma: fix incorrect type conversion for size during dma allocation

Browse source 
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>
This commit is contained in:
Rohit Vaswani 2015-10-22 13:32:11 -07:00 committed by Linus Torvalds
parent 5211613978
commit 67a2e213e7
4 changed files with 6 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/base/dma-contiguous.c
View file

@ -187,7 +187,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
* global one. Requires architecture specific dev_get_cma_area() helper * global one. Requires architecture specific dev_get_cma_area() helper
* function. * 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 int align)
{ {
if (align > CONFIG_CMA_ALIGNMENT) if (align > CONFIG_CMA_ALIGNMENT)

2
include/linux/cma.h
View file

@ -26,6 +26,6 @@ extern int __init cma_declare_contiguous(phys_addr_t base,
extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
unsigned int order_per_bit, unsigned int order_per_bit,
struct cma **res_cma); struct cma **res_cma);
extern struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align); extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align);
extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count);
#endif #endif

4
include/linux/dma-contiguous.h
View file

@ -111,7 +111,7 @@ static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size,
return ret; return ret;
} }
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 order); unsigned int order);
bool dma_release_from_contiguous(struct device *dev, struct page *pages, bool dma_release_from_contiguous(struct device *dev, struct page *pages,
int count); int count);
@ -144,7 +144,7 @@ int dma_declare_contiguous(struct device *dev, phys_addr_t size,
} }
static inline static inline
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 order) unsigned int order)
{ {
return NULL; return NULL;

4
mm/cma.c
View file

@ -361,7 +361,7 @@ int __init cma_declare_contiguous(phys_addr_t base,
* This function allocates part of contiguous memory on specific * This function allocates part of contiguous memory on specific
* contiguous memory area. * contiguous memory area.
*/ */
struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align) struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
{ {
unsigned long mask, offset, pfn, start = 0; unsigned long mask, offset, pfn, start = 0;
unsigned long bitmap_maxno, bitmap_no, bitmap_count; unsigned long bitmap_maxno, bitmap_no, bitmap_count;
@ -371,7 +371,7 @@ struct page *cma_alloc(struct cma *cma, unsigned int count, unsigned int align)
if (!cma || !cma->count) if (!cma || !cma->count)
return NULL; return NULL;
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); count, align);
if (!count) if (!count)