drm/panel: novatek-nt36536: Fix panel double-remove on attach failure
Subsystems (3)
PATCH 1/1 drm/panel: novatek-nt36536: Fix panel double-remove on attach failure
The DSI attach error path calls drm_panel_remove() by hand even though the panel was registered with devm_drm_panel_add(), which already arranges for drm_panel_remove() to run on driver detach. When mipi_dsi_attach() fails the panel is therefore removed twice: once directly and once again while devres unwinds.
drm_panel_add() takes a reference and drm_panel_remove() drops one, so the extra removal releases the last reference early and frees the panel container. The put registered by devm_drm_panel_alloc() then operates on freed memory, resulting in a use-after-free and a reference-count underflow when a DSI host rejects the requested configuration during probe.
Drop the manual drm_panel_remove() and let the managed cleanup handle it, matching the other dual-DSI panel drivers.
--- drivers/gpu/drm/panel/panel-novatek-nt36536.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/panel/panel-novatek-nt36536.c +1 -3
@@ -429,11 +429,9 @@ static int novatek_probe(struct mipi_dsi_device *dsi) ctx->dsi[i]->mode_flags = desc->mode_flags; ctx->dsi[i]->dsc = &ctx->dsc; ret =devm_mipi_dsi_attach (dev, ctx->dsi[i]); -if (ret <0 ) { -drm_panel_remove (&ctx->panel); +if (ret <0 )return dev_err_probe (dev, ret,"Failed to attach to DSI host\n" ); - } }if (desc->has_dcs_backlight) {
Signature · 1 line
2.53.0
Quoted 14 lines · David Carlier
The DSI attach error path calls
drm_panel_remove()by hand even though the panel was registered withdevm_drm_panel_add(), which already arranges fordrm_panel_remove()to run on driver detach. Whenmipi_dsi_attach()fails the panel is therefore removed twice: once directly and once again while devres unwinds.
drm_panel_add()takes a reference anddrm_panel_remove()drops one, so the extra removal releases the last reference early and frees the panel container. The put registered bydevm_drm_panel_alloc()then operates on freed memory, resulting in a use-after-free and a reference-count underflow when a DSI host rejects the requested configuration during probe.
Quoted 6 lines
Drop the manual
drm_panel_remove()and let the managed cleanup handle it, matching the other dual-DSI panel drivers.Fixes 75a5dbd1f4f7 ("drm/panel: Add Novatek NT36536 panel driver")Signed-off-by David Carlier <[email protected]>---
Thanks!
Quoted 23 lines
drivers/gpu/drm/panel/panel-novatek-nt36536.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/panel/panel-novatek-nt36536.c +1
-4@@ -429,11 +429,9 @@ static int novatek_probe(struct mipi_dsi_device *dsi) ctx->dsi[i]->mode_flags = desc->mode_flags; ctx->dsi[i]->dsc = &ctx->dsc; ret =devm_mipi_dsi_attach (dev, ctx->dsi[i]); -if (ret <0 ) { -drm_panel_remove (&ctx->panel); +if (ret <0 )return dev_err_probe (dev, ret,"Failed to attach to DSI host\n" ); - } }if (desc->has_dcs_backlight) { --2.53.0
Hi,
Quoted 6 lines · David Carlier
The DSI attach error path calls
drm_panel_remove()by hand even though the panel was registered withdevm_drm_panel_add(), which already arranges fordrm_panel_remove()to run on driver detach. Whenmipi_dsi_attach()fails the panel is therefore removed twice: once directly and once again while devres unwinds.
Quoted 8 lines
drm_panel_add()takes a reference anddrm_panel_remove()drops one, so the extra removal releases the last reference early and frees the panel container. The put registered bydevm_drm_panel_alloc()then operates on freed memory, resulting in a use-after-free and a reference-count underflow when a DSI host rejects the requested configuration during probe.[...]
Thanks, Applied to https://gitlab.freedesktop.org/drm/misc/kernel.git (drm-misc-next)
[1/1] drm/panel: novatek-nt36536: Fix panel double-remove on attach failure
https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/4085da1e6ad90ca7a227d8528de2c77042fabf8a
Signature · 1 line
Neil