The patch titled Subject: xen/gntdev.c: convert to use vm_map_pages() has been added to the -mm tree. Its filename is xen-gntdevc-convert-to-use-vm_map_pages.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/xen-gntdevc-convert-to-use-vm_map_pages.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/xen-gntdevc-convert-to-use-vm_map_pages.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Souptick Joarder <jrdr.linux@xxxxxxxxx> Subject: xen/gntdev.c: convert to use vm_map_pages() Convert to use vm_map_pages() to map range of kernel memory to user vma. map->count is passed to vm_map_pages() and internal API verify map->count against count ( count = vma_pages(vma)) for page array boundary overrun condition. Link: http://lkml.kernel.org/r/88e56e82d2db98705c2d842e9c9806c00b366d67.1552921225.git.jrdr.linux@xxxxxxxxx Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> Cc: David Airlie <airlied@xxxxxxxx> Cc: Heiko Stuebner <heiko@xxxxxxxxx> Cc: Joerg Roedel <joro@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Juergen Gross <jgross@xxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@xxxxxxxx> Cc: Pawel Osciak <pawel@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxxx> Cc: Robin Murphy <robin.murphy@xxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Cc: Sandy Huang <hjc@xxxxxxxxxxxxxx> Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Thierry Reding <treding@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/xen/gntdev.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) --- a/drivers/xen/gntdev.c~xen-gntdevc-convert-to-use-vm_map_pages +++ a/drivers/xen/gntdev.c @@ -1084,7 +1084,7 @@ static int gntdev_mmap(struct file *flip int index = vma->vm_pgoff; int count = vma_pages(vma); struct gntdev_grant_map *map; - int i, err = -EINVAL; + int err = -EINVAL; if ((vma->vm_flags & VM_WRITE) && !(vma->vm_flags & VM_SHARED)) return -EINVAL; @@ -1145,12 +1145,9 @@ static int gntdev_mmap(struct file *flip goto out_put_map; if (!use_ptemod) { - for (i = 0; i < count; i++) { - err = vm_insert_page(vma, vma->vm_start + i*PAGE_SIZE, - map->pages[i]); - if (err) - goto out_put_map; - } + err = vm_map_pages(vma, map->pages, map->count); + if (err) + goto out_put_map; } else { #ifdef CONFIG_X86 /* _ Patches currently in -mm which might be from jrdr.linux@xxxxxxxxx are mm-introduce-new-vm_map_pages-and-vm_map_pages_zero-api.patch arm-mm-dma-mapping-convert-to-use-vm_map_pages.patch drivers-firewire-core-isoc-convert-to-use-vm_map_pages_zero.patch drm-rockchip-rockchip_drm_gemc-convert-to-use-vm_map_pages.patch drm-xen-xen_drm_front_gemc-convert-to-use-vm_map_pages.patch iommu-dma-iommuc-convert-to-use-vm_map_pages.patch videobuf2-videobuf2-dma-sgc-convert-to-use-vm_map_pages.patch xen-gntdevc-convert-to-use-vm_map_pages.patch xen-privcmd-bufc-convert-to-use-vm_map_pages_zero.patch