diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2016-02-04 11:50:49 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-02-08 10:33:43 +0100 |
| commit | 4db3a2448ec8902310acb78de39b6227a9a56ac8 (patch) | |
| tree | 3521448d76f756cc0187e7fe11f683118ae781da | |
| parent | drm/i915/bxt: Don't save/restore eDP panel power during suspend (v3) (diff) | |
| download | linux-4db3a2448ec8902310acb78de39b6227a9a56ac8.tar.xz linux-4db3a2448ec8902310acb78de39b6227a9a56ac8.zip | |
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: 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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c index a5e99ac305da..349775e88e5b 100644 --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c @@ -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; } |