Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/YA6F3oF8mRaNQWjb@mwanda
(cherry picked from commit 784f70e17e6bc423a04fb6524634a76f68ab1192)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Dan Carpenter and committed by
Rodrigo Vivi
fbb2bdd2 2a8f20bb

+2 -1
+2 -1
drivers/gpu/drm/i915/gvt/cmd_parser.c
··· 3103 3103 struct intel_vgpu_submission *s = &vgpu->submission; 3104 3104 struct i915_request *requests[I915_NUM_ENGINES] = {}; 3105 3105 bool is_ctx_pinned[I915_NUM_ENGINES] = {}; 3106 - int ret; 3106 + int ret = 0; 3107 3107 3108 3108 if (gvt->is_reg_whitelist_updated) 3109 3109 return; ··· 3157 3157 if (IS_ERR(vaddr)) { 3158 3158 gvt_err("failed to pin init ctx obj, ring=%d, err=%lx\n", 3159 3159 id, PTR_ERR(vaddr)); 3160 + ret = PTR_ERR(vaddr); 3160 3161 goto out; 3161 3162 } 3162 3163