Skip to content
Snippets Groups Projects
Unverified Commit b7fd68ab authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Maxime Ripard
Browse files

drm: Do not overrun array in drm_gem_get_pages()


If the shared memory object is larger than the DRM object that it backs,
we can overrun the page array.  Limit the number of pages we install
from each folio to prevent this.

Signed-off-by: default avatar"Matthew Wilcox (Oracle)" <willy@infradead.org>
Reported-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Link: https://lore.kernel.org/lkml/13360591.uLZWGnKmhe@natalenko.name/


Fixes: 3291e09a ("drm: convert drm_gem_put_pages() to use a folio_batch")
Cc: stable@vger.kernel.org # 6.5.x
Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231005135648.2317298-1-willy@infradead.org
parent 2b7947bd
No related branches found
No related tags found
No related merge requests found
...@@ -540,7 +540,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) ...@@ -540,7 +540,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
struct page **pages; struct page **pages;
struct folio *folio; struct folio *folio;
struct folio_batch fbatch; struct folio_batch fbatch;
int i, j, npages; long i, j, npages;
if (WARN_ON(!obj->filp)) if (WARN_ON(!obj->filp))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -564,11 +564,13 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) ...@@ -564,11 +564,13 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj)
i = 0; i = 0;
while (i < npages) { while (i < npages) {
long nr;
folio = shmem_read_folio_gfp(mapping, i, folio = shmem_read_folio_gfp(mapping, i,
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
goto fail; goto fail;
for (j = 0; j < folio_nr_pages(folio); j++, i++) nr = min(npages - i, folio_nr_pages(folio));
for (j = 0; j < nr; j++, i++)
pages[i] = folio_file_page(folio, i); pages[i] = folio_file_page(folio, i);
/* Make sure shmem keeps __GFP_DMA32 allocated pages in the /* Make sure shmem keeps __GFP_DMA32 allocated pages in the
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment