Skip to contentSkip to conversation

drm/bridge: dw-mipi-dsi: Fix bridge leak when host attach fails

PATCH Superseded Osama Abdelkader 2 participants 3 messages Apr 2 – Apr 3

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/bridge: dw-mipi-dsi: Fix bridge leak when host attach fails

dw_mipi_dsi_host_attach() and dw_mipi_dsi2_host_attach() call drm_bridge_add() before pdata->host_ops->attach(). If attach fails, the bridge stayed registered without drm_bridge_remove(), leaking the bridge reference and leaving the device on the global bridge list.

On failure, undo in the same order as host_detach(): for dw-mipi-dsi, drm_of_panel_bridge_remove() then drm_bridge_remove(); for dw-mipi-dsi2, drm_bridge_remove() then drm_of_panel_bridge_remove().

Fixes 90910a651123 ("drm/bridge/synopsys: dsi: add ability to have glue-specific attach and detach")
Fixes 0d6d86253fef ("drm/bridge/synopsys: Add MIPI DSI2 host controller bridge")
---
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c  | 7 ++++++-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +6 -1
index ca4dea226f4b..ffa169c2de73 100644
@@ -345,10 +345,15 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,
 	if (pdata->host_ops && pdata->host_ops->attach) {
 		ret = pdata->host_ops->attach(pdata->priv_data, device);
 		if (ret < 0)
-			return ret;
+			goto err_remove_bridge;
 	}
 
 	return 0;
+
+err_remove_bridge:
+	drm_of_panel_bridge_remove(host->dev->of_node, 1, 0);
+	drm_bridge_remove(&dsi->bridge);
+	return ret;
 }
 
 static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host,
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c +6 -1
index e6eaf9fd0251..d7c922d8841c 100644
@@ -540,10 +540,15 @@ static int dw_mipi_dsi2_host_attach(struct mipi_dsi_host *host,
 	if (pdata->host_ops && pdata->host_ops->attach) {
 		ret = pdata->host_ops->attach(pdata->priv_data, device);
 		if (ret < 0)
-			return ret;
+			goto err_remove_bridge;
 	}
 
 	return 0;
+
+err_remove_bridge:
+	drm_bridge_remove(&dsi2->bridge);
+	drm_of_panel_bridge_remove(host->dev->of_node, 1, 0);
+	return ret;
 }
 
 static int dw_mipi_dsi2_host_detach(struct mipi_dsi_host *host,
Signature · 1 line
2.43.0
reviewer
#1 lore raw

Hello Osama,

Quoted 23 lines · Osama Abdelkader

dw_mipi_dsi_host_attach() and dw_mipi_dsi2_host_attach() call drm_bridge_add() before pdata->host_ops->attach(). If attach fails, the bridge stayed registered without drm_bridge_remove(), leaking the bridge reference and leaving the device on the global bridge list.

On failure, undo in the same order as host_detach(): for dw-mipi-dsi, drm_of_panel_bridge_remove() then drm_bridge_remove(); for dw-mipi-dsi2, drm_bridge_remove() then drm_of_panel_bridge_remove().

Fixes 90910a651123 ("drm/bridge/synopsys: dsi: add ability to have glue-specific attach and detach")
Fixes 0d6d86253fef ("drm/bridge/synopsys: Add MIPI DSI2 host controller bridge")
---
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c  | 7 ++++++-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -0
index ca4dea226f4b..ffa169c2de73 100644
@@ -345,10 +345,15 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,
 	if (pdata->host_ops && pdata->host_ops->attach) {

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, · line 354

Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +4 -1
 		ret = pdata->host_ops->attach(pdata->priv_data, device);
 		if (ret < 0)
-			return ret;
+			goto err_remove_bridge;
 	}
 
 	return 0;
+
+err_remove_bridge:
+	drm_of_panel_bridge_remove(host->dev->of_node, 1, 0);

It was added by a devm_action, you shouldn't remove it here. Besides, devm_drm_of_get_bridge() might return A) a panel_bridge or B) a pointer to another, pre-existing bridge (and the called can't know which one got returned). drm_of_panel_bridge_remove() unconditionally removes a panel_bridge so it's wrong in case B.

Which means the drm_of_panel_bridge_remove() in _host_detach is probably wrong and you should look at it.

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, · line 355

Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+	drm_bridge_remove(&dsi->bridge);

This is correct, even though using devm_drm_bridge_add() instead of drm_bridge_add() above is probably the simplest solution.

Same for the other driver in this patch.

Luca

--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#2 lore raw

Hello Luca,

Quoted 43 lines · Luca Ceresoli

Hello Osama,

Quoted 23 lines · Osama Abdelkader

dw_mipi_dsi_host_attach() and dw_mipi_dsi2_host_attach() call drm_bridge_add() before pdata->host_ops->attach(). If attach fails, the bridge stayed registered without drm_bridge_remove(), leaking the bridge reference and leaving the device on the global bridge list.

On failure, undo in the same order as host_detach(): for dw-mipi-dsi, drm_of_panel_bridge_remove() then drm_bridge_remove(); for dw-mipi-dsi2, drm_bridge_remove() then drm_of_panel_bridge_remove().

Fixes 90910a651123 ("drm/bridge/synopsys: dsi: add ability to have glue-specific attach and detach")
Fixes 0d6d86253fef ("drm/bridge/synopsys: Add MIPI DSI2 host controller bridge")
---
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c  | 7 ++++++-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +0 -0
index ca4dea226f4b..ffa169c2de73 100644
@@ -345,10 +345,15 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,
 	if (pdata->host_ops && pdata->host_ops->attach) {

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, · line 354

Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +4 -1
 		ret = pdata->host_ops->attach(pdata->priv_data, device);
 		if (ret < 0)
-			return ret;
+			goto err_remove_bridge;
 	}
 
 	return 0;
+
+err_remove_bridge:
+	drm_of_panel_bridge_remove(host->dev->of_node, 1, 0);

It was added by a devm_action, you shouldn't remove it here. Besides, devm_drm_of_get_bridge() might return A) a panel_bridge or B) a pointer to another, pre-existing bridge (and the called can't know which one got returned). drm_of_panel_bridge_remove() unconditionally removes a panel_bridge so it's wrong in case B.

Quoted 4 lines

Which means the drm_of_panel_bridge_remove() in _host_detach is probably wrong and you should look at it.

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, · line 355

Quoted 1 line
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
+	drm_bridge_remove(&dsi->bridge);

Thanks for the information, I'm going to look at it in another patch.

Quoted 5 lines

This is correct, even though using devm_drm_bridge_add() instead of drm_bridge_add() above is probably the simplest solution.

Same for the other driver in this patch.

Thank you, I just did that in v2.
Thanks,
Osama

Quoted 7 lines

Luca

--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com