aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Srb <msrb@suse.com>2018-02-05 11:04:38 -0500
committerRodrigo Vivi <rodrigo.vivi@intel.com>2018-02-06 14:41:40 -0500
commitb3ad99ed45917f42884fee731fa3cf9b8229a26c (patch)
tree3656d717867d7a011efcd1bdeaff130ed27f49e2
parentb18224e95cb13ef7517aa26e6b47c85117327f11 (diff)
drm/i915/cmdparser: Do not check past the cmd length.
The command MEDIA_VFE_STATE checks bits at offset +2 dwords. However, it is possible to have MEDIA_VFE_STATE command with length = 0 + LENGTH_BIAS = 2. In that case check_cmd will read bits from the following command, or even past the end of the buffer. If the offset ends up outside of the command length, reject the command. Fixes: 351e3db2b363 ("drm/i915: Implement command buffer parsing logic") Signed-off-by: Michal Srb <msrb@suse.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180205151745.29292-1-msrb@suse.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/20180205160438.3267-2-chris@chris-wilson.co.uk (cherry picked from commit 3aec7f871c65eb5f76b4125fda432593c834a6f2) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_cmd_parser.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index ab4c8b0ec886..95478db9998b 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -1212,6 +1212,12 @@ static bool check_cmd(const struct intel_engine_cs *engine,
1212 continue; 1212 continue;
1213 } 1213 }
1214 1214
1215 if (desc->bits[i].offset >= length) {
1216 DRM_DEBUG_DRIVER("CMD: Rejected command 0x%08X, too short to check bitmask (%s)\n",
1217 *cmd, engine->name);
1218 return false;
1219 }
1220
1215 dword = cmd[desc->bits[i].offset] & 1221 dword = cmd[desc->bits[i].offset] &
1216 desc->bits[i].mask; 1222 desc->bits[i].mask;
1217 1223