]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 1 Sep 2022 15:35:20 +0000 (18:35 +0300)
committerJuergen Gross <jgross@suse.com>
Fri, 2 Sep 2022 09:05:19 +0000 (11:05 +0200)
The change from kcalloc() to kvmalloc() means that arg->nr_pages
might now be large enough that the "args->nr_pages << PAGE_SHIFT" can
result in an integer overflow.

Fixes: b3f7931f5c61 ("xen/gntdev: switch from kcalloc() to kvcalloc()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/YxDROJqu/RPvR0bi@kili
Signed-off-by: Juergen Gross <jgross@suse.com>
drivers/xen/grant-table.c

index 738029de3c6722598ba3c96441f0109159b6fed3..e1ec725c2819d4d5dede063eb00d86a6d52944c0 100644 (file)
@@ -1047,6 +1047,9 @@ int gnttab_dma_alloc_pages(struct gnttab_dma_alloc_args *args)
        size_t size;
        int i, ret;
 
+       if (args->nr_pages < 0 || args->nr_pages > (INT_MAX >> PAGE_SHIFT))
+               return -ENOMEM;
+
        size = args->nr_pages << PAGE_SHIFT;
        if (args->coherent)
                args->vaddr = dma_alloc_coherent(args->dev, size,