drm/i915: Fix a crash in shmem_pin_map() error handling
Subsystems (3)
PATCH 1/1 drm/i915: Fix a crash in shmem_pin_map() error handling
There is a signedness bug in shmem_pin_map() error handling because "i" is unsigned. The "while (--i >= 0)" will loop forever until the system crashes.
--- drivers/gpu/drm/i915/gt/shmem_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/shmem_utils.c +2 -1
@@ -52,8 +52,9 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj)void *shmem_pin_map (struct file *file) {struct page **pages; -size_t n_pages, i; +size_t n_pages;void *vaddr; +int i; n_pages = file->f_mapping->host->i_size >>PAGE_SHIFT ; pages =kvmalloc_array (n_pages,sizeof (*pages),GFP_KERNEL );
Signature · 1 line
2.28.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix a crash in shmem_pin_map() error handling
== Series Details ==
== Series Details ==
Series: drm/i915: Fix a crash in shmem_pin_map() error handling
URL : https://patchwork.freedesktop.org/series/82989/
State : failure
== Summary ==
Applying: drm/i915: Fix a crash in shmem_pin_map() error handling Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/shmem_utils.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/shmem_utils.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/shmem_utils.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915: Fix a crash in shmem_pin_map() error handling When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Dan Carpenter
There is a signedness bug in
shmem_pin_map()error handling because "i" is unsigned. The "while (--i >= 0)" will loop forever until the system crashes.
I actually sent a patch to Andrew before the end of the merge window to use a for loop with a new j iterator to fix this based on your automated report, but it looks like that didn't go in.
Quoted 11 lines
Fixes bfed6708d6c9 ("drm/i915: use vmap in shmem_pin_map")Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/i915/gt/shmem_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gt/shmem_utils.c +0
-0
drivers/gpu/drm/i915/gt/shmem_utils.c struct file *shmem_create_from_object(struct drm_i915_gem_object *obj) · line 60
Quoted 10 lines
drivers/gpu/drm/i915/gt/shmem_utils.c +2
-1@@ -52,8 +52,9 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj)void *shmem_pin_map (struct file *file) {struct page **pages; -size_t n_pages, i; +size_t n_pages;void *vaddr; +int i; n_pages = file->f_mapping->host->i_size >>PAGE_SHIFT ; pages =kvmalloc_array (n_pages,sizeof (*pages),GFP_KERNEL );
This assumes we never have more than INT_MAX worth of pages before a failure.
Quoted 13 lines · Christoph Hellwig
Quoted 13 lines
drivers/gpu/drm/i915/gt/shmem_utils.c +2
-1@@ -52,8 +52,9 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj)void *shmem_pin_map (struct file *file) {struct page **pages; -size_t n_pages, i; +size_t n_pages;void *vaddr; +int i;
Quoted 5 lines
drivers/gpu/drm/i915/gt/shmem_utils.c struct file *shmem_create_from_object(struct drm_i915_gem_object *obj) · line 60
Quoted 2 lines
drivers/gpu/drm/i915/gt/shmem_utils.c +0
-0n_pages = file->f_mapping->host->i_size >>PAGE_SHIFT ; pages =kvmalloc_array (n_pages,sizeof (*pages),GFP_KERNEL );This assumes we never have more than
INT_MAXworth of pages before a failure.
Doh. Yeah. My bad.
regards,
dan carpenter