xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()

[PATCH] xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()

Posted by Dan Carpenter 1 year, 8 months ago

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>
---
 drivers/xen/grant-table.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 738029de3c67..e1ec725c2819 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -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,
-- 
2.35.1

Re: [PATCH] xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()

Posted by Juergen Gross 1 year, 8 months ago

On 01.09.22 17:35, Dan Carpenter wrote:
> 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>


Juergen