[PATCH 1/2] drm/i915: Warn before accessing an illegal ddi_port_info

Chris Wilson chris at chris-wilson.co.uk
Thu Feb 23 10:08:52 UTC 2017


Check that our port index is within bounds before chasing into the
array.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index cd6fedd229a0..216b6d017f00 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1491,6 +1491,9 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, u32 level)
 	uint8_t dp_iboost, hdmi_iboost;
 	int n_entries;
 
+	if (WARN_ON((unsigned)port >= ARRAY_SIZE(dev_priv->vbt.ddi_port_info)))
+		return;
+
 	/* VBT may override standard boost values */
 	dp_iboost = dev_priv->vbt.ddi_port_info[port].dp_boost_level;
 	hdmi_iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level;
@@ -1505,6 +1508,9 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, u32 level)
 			else
 				ddi_translations = skl_get_buf_trans_dp(dev_priv,
 									&n_entries);
+			if (WARN_ON(level >= n_entries))
+				return;
+
 			iboost = ddi_translations[level].i_boost;
 		}
 	} else if (type == INTEL_OUTPUT_EDP) {
@@ -1517,6 +1523,9 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, u32 level)
 				    port != PORT_E && n_entries > 9))
 				n_entries = 9;
 
+			if (WARN_ON(level >= n_entries))
+				return;
+
 			iboost = ddi_translations[level].i_boost;
 		}
 	} else if (type == INTEL_OUTPUT_HDMI) {
@@ -1524,6 +1533,10 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, u32 level)
 			iboost = hdmi_iboost;
 		} else {
 			ddi_translations = skl_get_buf_trans_hdmi(dev_priv, &n_entries);
+
+			if (WARN_ON(level >= n_entries))
+				return;
+
 			iboost = ddi_translations[level].i_boost;
 		}
 	} else {
-- 
2.11.0



More information about the Intel-gfx-trybot mailing list