Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db3a244 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: defend gpio table against out of bounds access



Do not blindly trust the VBT data used for indexing.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/cc32d40c2b47f2d2151811855ac2c3dabab1d57d.1454582914.git.jani.nikula@intel.com


(cherry picked from commit 5d2d0a12)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 949d0b51
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -209,6 +209,11 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
	/* pull up/down */
	action = *data++;

	if (gpio >= ARRAY_SIZE(gtable)) {
		DRM_DEBUG_KMS("unknown gpio %u\n", gpio);
		goto out;
	}

	function = gtable[gpio].function_reg;
	pad = gtable[gpio].pad_reg;

@@ -226,6 +231,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
	vlv_gpio_nc_write(dev_priv, pad, val);
	mutex_unlock(&dev_priv->sb_lock);

out:
	return data;
}