Skip to contentSkip to conversation

drm/i915: Uninitialized variable in i915_gem_object_map_page()

PATCH In review Dan Carpenter 4 participants 4 messages Sep 24, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Uninitialized variable in i915_gem_object_map_page()

The "i" iterator is never set to zero. This probably doesn't affect testing because GCC sometimes initializes variables and also we have a new pluggin to initialize stack variables to zero.

Fixes 7edd32a9e614 ("drm/i915: use vmap in i915_gem_object_map")

---
Hi Andrew, this should probably go through the -mm tree and get folded into the original patch.

 drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +2 -0
index 90029ea83aed..12bedabc1daa 100644
@@ -266,6 +266,7 @@ static void *i915_gem_object_map_page(struct drm_i915_gem_object *obj,
 			return NULL;
 	}
 
+	i = 0;
 	for_each_sgt_page(page, iter, obj->mm.pages)
 		pages[i++] = page;
 	vaddr = vmap(pages, n_pages, 0, pgprot);
@@ -291,6 +292,7 @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj)
 			return NULL;
 	}
 
+	i = 0;
 	for_each_sgt_daddr(addr, iter, obj->mm.pages)
 		pfns[i++] = (iomap + addr) >> PAGE_SHIFT;
 	vaddr = vmap_pfn(pfns, n_pfn, pgprot_writecombine(PAGE_KERNEL_IO));
Signature · 1 line
2.28.0
#1 lore raw
Quoted 9 lines · Dan Carpenter

The "i" iterator is never set to zero. This probably doesn't affect testing because GCC sometimes initializes variables and also we have a new pluggin to initialize stack variables to zero.

Fixes 7edd32a9e614 ("drm/i915: use vmap in i915_gem_object_map")

---
Hi Andrew, this should probably go through the -mm tree and get folded into the original patch.

FYI, I'll need to resend anyway, and I've folded this into the latest branch.

#2 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Uninitialized variable in i915_gem_object_map_page()

In reply to Dan Carpenter
== Series Details ==

== Series Details ==

Series: drm/i915: Uninitialized variable in i915_gem_object_map_page()
URL : https://patchwork.freedesktop.org/series/82060/
State : failure

== Summary ==

Applying: drm/i915: Uninitialized variable in i915_gem_object_map_page() Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_pages.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pages.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: Uninitialized variable in i915_gem_object_map_page() 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

#3 lore raw
In reply to Dan Carpenter

Hi Dan,

Quoted 10 lines · On Thu, 24 Sep 2020 11:18:30 +0300 Dan Carpenter <[email protected]>…

The "i" iterator is never set to zero. This probably doesn't affect testing because GCC sometimes initializes variables and also we have a new pluggin to initialize stack variables to zero.

Fixes 7edd32a9e614 ("drm/i915: use vmap in i915_gem_object_map")

---
Hi Andrew, this should probably go through the -mm tree and get folded into the original patch.

Added to linux-next today.

Signature · 2 lines
Cheers,
Stephen Rothwell