Skip to contentSkip to conversation

omapdrm: fix missing check on list iterator

PATCH RESEND In review Xiaomeng Tong 2 participants 2 messages Apr 14, 2022

Subsystems (4)

v1 of 3 In review Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 omapdrm: fix missing check on list iterator

The bug is here:

	bus_flags = connector->display_info.bus_flags;

The list iterator 'connector-' will point to a bogus position containing HEAD if the list is empty or no element is found. This case must be checked before any use of the iterator, otherwise it will lead to a invalid memory access.

To fix this bug, add an check. Use a new value 'iter' as the list iterator, while use the old value 'connector' as a dedicated variable to point to the found element.

Fixes ("drm/omap: Add support for drm_panel")
---
 drivers/gpu/drm/omapdrm/omap_encoder.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/omapdrm/omap_encoder.c +9 -5
index 4dd05bc732da..d648ab4223b1 100644
@@ -76,14 +76,16 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
 	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
 	struct omap_dss_device *output = omap_encoder->output;
 	struct drm_device *dev = encoder->dev;
-	struct drm_connector *connector;
+	struct drm_connector *connector = NULL, *iter;
 	struct drm_bridge *bridge;
 	struct videomode vm = { 0 };
 	u32 bus_flags;
 
-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-		if (connector->encoder == encoder)
+	list_for_each_entry(iter, &dev->mode_config.connector_list, head) {
+		if (iter->encoder == encoder) {
+			connector = iter;
 			break;
+		}
 	}
 
 	drm_display_mode_to_videomode(adjusted_mode, &vm);
@@ -106,8 +108,10 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
 		omap_encoder_update_videomode_flags(&vm, bus_flags);
 	}
 
-	bus_flags = connector->display_info.bus_flags;
-	omap_encoder_update_videomode_flags(&vm, bus_flags);
+	if (connector) {
+		bus_flags = connector->display_info.bus_flags;
+		omap_encoder_update_videomode_flags(&vm, bus_flags);
+	}
 
 	/* Set timings for all devices in the display pipeline. */
 	dss_mgr_set_timings(output, &vm);
Signature · 1 line
2.17.1
maintainer
#1 lore raw

Hi,

Quoted 31 lines · Xiaomeng Tong

The bug is here:

	bus_flags = connector->display_info.bus_flags;

The list iterator 'connector-' will point to a bogus position containing HEAD if the list is empty or no element is found. This case must be checked before any use of the iterator, otherwise it will lead to a invalid memory access.

To fix this bug, add an check. Use a new value 'iter' as the list iterator, while use the old value 'connector' as a dedicated variable to point to the found element.

Fixes ("drm/omap: Add support for drm_panel")
---
  drivers/gpu/drm/omapdrm/omap_encoder.c | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/omapdrm/omap_encoder.c +1 -1
index 4dd05bc732da..d648ab4223b1 100644
@@ -76,14 +76,16 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
  	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
  	struct omap_dss_device *output = omap_encoder->output;
  	struct drm_device *dev = encoder->dev;
-	struct drm_connector *connector;
+	struct drm_connector *connector = NULL, *iter;
  	struct drm_bridge *bridge;
  	struct videomode vm = { 0 };

drivers/gpu/drm/omapdrm/omap_encoder.c static void omap_encoder_mode_set(struct drm_encoder *encoder, · line 89

Quoted 10 lines
drivers/gpu/drm/omapdrm/omap_encoder.c +4 -2
  	u32 bus_flags;
 
-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-		if (connector->encoder == encoder)
+	list_for_each_entry(iter, &dev->mode_config.connector_list, head) {
+		if (iter->encoder == encoder) {
+			connector = iter;
  			break;
+		}
  	}

When does this bug happen? How do you get omap_encoder_mode_set() called for an encoder with a connector that is not valid?

Quoted 5 lines
drivers/gpu/drm/omapdrm/omap_encoder.c +0 -0
  	drm_display_mode_to_videomode(adjusted_mode, &vm);
@@ -106,8 +108,10 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
  		omap_encoder_update_videomode_flags(&vm, bus_flags);
  	}

drivers/gpu/drm/omapdrm/omap_encoder.c static void omap_encoder_mode_set(struct drm_encoder *encoder, · line 117

Quoted 10 lines
drivers/gpu/drm/omapdrm/omap_encoder.c +4 -2
 
-	bus_flags = connector->display_info.bus_flags;
-	omap_encoder_update_videomode_flags(&vm, bus_flags);
+	if (connector) {
+		bus_flags = connector->display_info.bus_flags;
+		omap_encoder_update_videomode_flags(&vm, bus_flags);
+	}
 
  	/* Set timings for all devices in the display pipeline. */
  	dss_mgr_set_timings(output, &vm);

How does this fix the issue? You just skip the lines that set up the videomode, but then pass that videomode to dss_mgr_set_timings()...

Tomi