Skip to contentSkip to conversation

drm/bridge: panel: Prevent ERR_PTR Dereference

PATCH Applied Maxime Ripard 3 participants 4 messages Jan 2, 2023 – Jan 5, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/bridge: panel: Prevent ERR_PTR Dereference

Commit 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel") introduced an access to the bridge pointer in the devm_drm_panel_bridge_add_typed() function.

However, due to the unusual ERR_PTR check when getting that pointer, the pointer access is done even though the pointer might be an error pointer.

Rework the function for a more traditional design that will return immediately if it gets an ERR_PTR so that we never access the pointer in that case.

Fixes 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel")
---
 drivers/gpu/drm/bridge/panel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/panel.c +5 -4
index 1708098fba6d..e8aae3cdc73d 100644
@@ -357,15 +357,16 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
 		return ERR_PTR(-ENOMEM);
 
 	bridge = drm_panel_bridge_add_typed(panel, connector_type);
-	if (!IS_ERR(bridge)) {
-		*ptr = bridge;
-		devres_add(dev, ptr);
-	} else {
+	if (IS_ERR(bridge)) {
 		devres_free(ptr);
+		return bridge;
 	}
 
 	bridge->pre_enable_prev_first = panel->prepare_prev_first;
 
+	*ptr = bridge;
+	devres_add(dev, ptr);
+
 	return bridge;
 }
 EXPORT_SYMBOL(devm_drm_panel_bridge_add_typed);
Signature · 1 line
2.38.1
reviewer Reviewed-by on v1 1/1
#1 lore raw

Hi Maxime,

Thank you for the patch.

Quoted 8 lines · Maxime Ripard

Commit 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel") introduced an access to the bridge pointer in the devm_drm_panel_bridge_add_typed() function.

However, due to the unusual ERR_PTR check when getting that pointer, the pointer access is done even though the pointer might be an error pointer.

Quoted 8 lines

Rework the function for a more traditional design that will return immediately if it gets an ERR_PTR so that we never access the pointer in that case.

Fixes 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel")
Quoted 29 lines
---
 drivers/gpu/drm/bridge/panel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/panel.c +5 -4
index 1708098fba6d..e8aae3cdc73d 100644
@@ -357,15 +357,16 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
 		return ERR_PTR(-ENOMEM);
 
 	bridge = drm_panel_bridge_add_typed(panel, connector_type);
-	if (!IS_ERR(bridge)) {
-		*ptr = bridge;
-		devres_add(dev, ptr);
-	} else {
+	if (IS_ERR(bridge)) {
 		devres_free(ptr);
+		return bridge;
 	}
 
 	bridge->pre_enable_prev_first = panel->prepare_prev_first;
 
+	*ptr = bridge;
+	devres_add(dev, ptr);
+
 	return bridge;
 }
 EXPORT_SYMBOL(devm_drm_panel_bridge_add_typed);
Signature · 3 lines
Regards,

Laurent Pinchart
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Maxime Ripard
Quoted 8 lines · Maxime Ripard

Commit 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel") introduced an access to the bridge pointer in the devm_drm_panel_bridge_add_typed() function.

However, due to the unusual ERR_PTR check when getting that pointer, the pointer access is done even though the pointer might be an error pointer.

Quoted 8 lines

Rework the function for a more traditional design that will return immediately if it gets an ERR_PTR so that we never access the pointer in that case.

Fixes 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel")

Regards
Andrzej

Quoted 29 lines
---
  drivers/gpu/drm/bridge/panel.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/panel.c +5 -4
index 1708098fba6d..e8aae3cdc73d 100644
@@ -357,15 +357,16 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
  		return ERR_PTR(-ENOMEM);
 
  	bridge = drm_panel_bridge_add_typed(panel, connector_type);
-	if (!IS_ERR(bridge)) {
-		*ptr = bridge;
-		devres_add(dev, ptr);
-	} else {
+	if (IS_ERR(bridge)) {
  		devres_free(ptr);
+		return bridge;
  	}
 
  	bridge->pre_enable_prev_first = panel->prepare_prev_first;
 
+	*ptr = bridge;
+	devres_add(dev, ptr);
+
  	return bridge;
  }
  EXPORT_SYMBOL(devm_drm_panel_bridge_add_typed);
author Applied
#3 lore raw

Re: (subset) [PATCH] drm/bridge: panel: Prevent ERR_PTR Dereference

In reply to Maxime Ripard
Quoted 9 lines · Maxime Ripard

Commit 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel") introduced an access to the bridge pointer in the devm_drm_panel_bridge_add_typed() function.

However, due to the unusual ERR_PTR check when getting that pointer, the pointer access is done even though the pointer might be an error pointer.

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime