diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2022-09-01 18:35:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-08 12:28:05 +0200 |
| commit | 763d77241d8fc79225a939a3512a5b986d4c9aae (patch) | |
| tree | f48122f197d3b34f12a307ff884454ff73f887db | |
| parent | 03b1870fbc5e2488370ceccc0e346e71f07dc9d0 (diff) | |
| download | linux-763d77241d8fc79225a939a3512a5b986d4c9aae.tar.gz linux-763d77241d8fc79225a939a3512a5b986d4c9aae.tar.bz2 linux-763d77241d8fc79225a939a3512a5b986d4c9aae.zip | |
xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()
[ 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>
| -rw-r--r-- | drivers/xen/grant-table.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 5c83d41766c8..0a2d24d6ac6f 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -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, |