]> git.proxmox.com Git - mirror_ubuntu-jammy-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)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 23 Nov 2022 14:10:55 +0000 (15:10 +0100)
BugLink: https://bugs.launchpad.net/bugs/1991840
[ Upstream commit e9ea0b30ada008f4e65933f449db6894832cb242 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/xen/grant-table.c

index 5c83d41766c8522cb0fbf65f28469b818f7b1ed0..0a2d24d6ac6f735e8290e633c880571f3936c86e 100644 (file)
@@ -981,6 +981,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,