Skip to contentSkip to conversation

drm/i915: Do kunmap if renderstate parsing fails

PATCH In review Mika Kuoppala 3 participants 3 messages Jul 16, 2015 – Jul 20, 2015

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

PATCH 1/1 drm/i915: Do kunmap if renderstate parsing fails

Kunmap the renderstate page on error path.

---
 drivers/gpu/drm/i915/i915_gem_render_state.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_render_state.c +8 -2
index a0201fc..b6492fe 100644
@@ -96,8 +96,10 @@ static int render_state_setup(struct render_state *so)
 			s = lower_32_bits(r);
 			if (so->gen >= 8) {
 				if (i + 1 >= rodata->batch_items ||
-				    rodata->batch[i + 1] != 0)
-					return -EINVAL;
+				    rodata->batch[i + 1] != 0) {
+					ret = -EINVAL;
+					goto err_out;
+				}
 
 				d[i++] = s;
 				s = upper_32_bits(r);
@@ -120,6 +122,10 @@ static int render_state_setup(struct render_state *so)
 	}
 
 	return 0;
+
+err_out:
+	kunmap(page);
+	return ret;
 }
 
 void i915_gem_render_state_fini(struct render_state *so)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 26 lines · Mika Kuoppala

Kunmap the renderstate page on error path.

---
  drivers/gpu/drm/i915/i915_gem_render_state.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_render_state.c +4 -2
index a0201fc..b6492fe 100644
@@ -96,8 +96,10 @@ static int render_state_setup(struct render_state *so)
  			s = lower_32_bits(r);
  			if (so->gen >= 8) {
  				if (i + 1 >= rodata->batch_items ||
-				    rodata->batch[i + 1] != 0)
-					return -EINVAL;
+				    rodata->batch[i + 1] != 0) {
+					ret = -EINVAL;
+					goto err_out;
+				}
 
  				d[i++] = s;
  				s = upper_32_bits(r);

drivers/gpu/drm/i915/i915_gem_render_state.c static int render_state_setup(struct render_state *so) · line 131

Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_render_state.c +4 -0
@@ -120,6 +122,10 @@ static int render_state_setup(struct render_state *so)
  	}
 
  	return 0;
+
+err_out:
+	kunmap(page);
+	return ret;
  }
 
  void i915_gem_render_state_fini(struct render_state *so)

Looks good to me,

regards
Arun

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

Tested-by on v1 1/1
#2 lore raw
In reply to Mika Kuoppala

Task id: 6815 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

ILK                                  302/302              302/302
SNB                                  315/315              315/315
IVB                                  342/342              342/342
BYT                                  285/285              285/285
HSW                                  378/378              378/378

-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx