Skip to contentSkip to conversation

drm/i915/gvt: fix uninitialized return in intel_gvt_update_reg_whitelist()

PATCH In review Dan Carpenter 4 participants 4 messages Jan 25, 2021 – Jan 26, 2021

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

PATCH 1/1 drm/i915/gvt: fix uninitialized return in intel_gvt_update_reg_whitelist()

Smatch found an uninitialized variable bug in this code:

drivers/gpu/drm/i915/gvt/cmd_parser.c:3191 intel_gvt_update_reg_whitelist()
error: uninitialized symbol 'ret'.

The first thing that Smatch complains about is that "ret" isn't set if we don't enter the "for_each_engine(engine, &dev_priv->gt, id) {" loop. Presumably we always have at least one engine so that's a false positive.

But it's definitely a bug to not set "ret" if i915_gem_object_pin_map() fails.

Let's fix the bug and silence the false positive.

Fixes 493f30cd086e ("drm/i915/gvt: parse init context to update cmd accessible reg whitelist")
---
 drivers/gpu/drm/i915/gvt/cmd_parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/cmd_parser.c +2 -1
index 7fb91de06557..d54ea0e4681d 100644
@@ -3103,7 +3103,7 @@ void intel_gvt_update_reg_whitelist(struct intel_vgpu *vgpu)
 	struct intel_vgpu_submission *s = &vgpu->submission;
 	struct i915_request *requests[I915_NUM_ENGINES] = {};
 	bool is_ctx_pinned[I915_NUM_ENGINES] = {};
-	int ret;
+	int ret = 0;
 
 	if (gvt->is_reg_whitelist_updated)
 		return;
@@ -3157,6 +3157,7 @@ void intel_gvt_update_reg_whitelist(struct intel_vgpu *vgpu)
 		if (IS_ERR(vaddr)) {
 			gvt_err("failed to pin init ctx obj, ring=%d, err=%lx\n",
 				id, PTR_ERR(vaddr));
+			ret = PTR_ERR(vaddr);
 			goto out;
 		}
 
Signature · 1 line
2.29.2
Reviewed-by on v1 1/1
#1 lore raw

Quoting Dan Carpenter (2021-01-25 08:48:30)

Quoted 5 lines

Smatch found an uninitialized variable bug in this code:

drivers/gpu/drm/i915/gvt/cmd_parser.c:3191 intel_gvt_update_reg_whitelist()
error: uninitialized symbol 'ret'.

Quoted 7 lines

The first thing that Smatch complains about is that "ret" isn't set if we don't enter the "for_each_engine(engine, &dev_priv->gt, id) {" loop. Presumably we always have at least one engine so that's a false positive.

But it's definitely a bug to not set "ret" if i915_gem_object_pin_map() fails.

True.

Quoted 4 lines

Let's fix the bug and silence the false positive.

Fixes 493f30cd086e ("drm/i915/gvt: parse init context to update cmd accessible reg whitelist")

-Chris

#2 lore raw
Quoted 14 lines · Chris Wilson

Quoting Dan Carpenter (2021-01-25 08:48:30)

Quoted 5 lines

Smatch found an uninitialized variable bug in this code:

drivers/gpu/drm/i915/gvt/cmd_parser.c:3191 intel_gvt_update_reg_whitelist()
error: uninitialized symbol 'ret'.

Quoted 7 lines

The first thing that Smatch complains about is that "ret" isn't set if we don't enter the "for_each_engine(engine, &dev_priv->gt, id) {" loop. Presumably we always have at least one engine so that's a false positive.

But it's definitely a bug to not set "ret" if i915_gem_object_pin_map() fails.

Quoted 7 lines

True.

Quoted 4 lines

Let's fix the bug and silence the false positive.

Fixes 493f30cd086e ("drm/i915/gvt: parse init context to update cmd accessible reg whitelist")

Thanks, Dan & Chris! Queued this up.

#3 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gvt: fix uninitialized return in intel_gvt_update_reg_whitelist()

In reply to Dan Carpenter
== Series Details ==

== Series Details ==

Series: drm/i915/gvt: fix uninitialized return in intel_gvt_update_reg_whitelist()
URL : https://patchwork.freedesktop.org/series/86235/
State : failure

== Summary ==

Applying: drm/i915/gvt: fix uninitialized return in intel_gvt_update_reg_whitelist() Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gvt/cmd_parser.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c
No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx