From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 13 May 2019 09:22:44 +0000 (+0300)
Subject: drm/i915/gvt: Fix an error code in ppgtt_populate_spt_by_guest_entry()
X-Git-Tag: v5.2-rc2~17^2~1^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=591c39ffac4ab1ddf2ea6d49331cb614e0682b28;p=thirdparty%2Flinux.git

drm/i915/gvt: Fix an error code in ppgtt_populate_spt_by_guest_entry()

"ret" is uninitialized on this path but it should be -EINVAL.

Fixes: 930c8dfea4b8 ("drm/i915/gvt: Check if get_next_pt_type() always returns a valid value")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
---

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 08c74e65836b5..244ad17297646 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1076,8 +1076,10 @@ static struct intel_vgpu_ppgtt_spt *ppgtt_populate_spt_by_guest_entry(
 	} else {
 		int type = get_next_pt_type(we->type);
 
-		if (!gtt_type_is_pt(type))
+		if (!gtt_type_is_pt(type)) {
+			ret = -EINVAL;
 			goto err;
+		}
 
 		spt = ppgtt_alloc_spt_gfn(vgpu, type, ops->get_pfn(we), ips);
 		if (IS_ERR(spt)) {