Commit 7a35478f authored Feb 04, 2016 by Jani Nikula Committed by Greg Kroah-Hartman Mar 03, 2016

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



commit 4db3a2448ec8902310acb78de39b6227a9a56ac8 upstream.

Do not blindly trust the VBT data used for indexing.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/cc32d40c2b47f2d2151811855ac2c3dabab1d57d.1454582914.git.jani.nikula@intel.com


(cherry picked from commit 5d2d0a12d3d08bf50434f0b5947bb73bac04b941)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2f1e7d5f

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c

+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;
		}