[PATCH] drm/pl111: Fix error handling in pl111_amba_probe

Subsystems: drm driver for arm pl111 clcd, drm drivers, drm drivers and misc gpu patches, the rest

STALE281d LANDED

Landed in mainline as 0ddd3bb4b14c on 2025-12-31.

2 messages, 2 authors, 2025-12-31 · open the first message on its own page

[PATCH] drm/pl111: Fix error handling in pl111_amba_probe

From: Miaoqian Lin <hidden>
Date: 2025-12-11 12:33:58

Jump to the existing dev_put label when devm_request_irq() fails
so drm_dev_put() and of_reserved_mem_device_release() run
instead of returning early and leaking resources.

Found via static analysis and code review.

Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin <redacted>
---
 drivers/gpu/drm/pl111/pl111_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index 56ff6a3fb483..d7dc83cf7b00 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -295,7 +295,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
 			       variant->name, priv);
 	if (ret != 0) {
 		dev_err(dev, "%s failed irq %d\n", __func__, ret);
-		return ret;
+		goto dev_put;
 	}
 
 	ret = pl111_modeset_init(drm);
-- 
2.25.1

Re: [PATCH] drm/pl111: Fix error handling in pl111_amba_probe

From: Linus Walleij <linusw@kernel.org>
Date: 2025-12-31 21:45:51

On Thu, Dec 11, 2025 at 1:34 PM Miaoqian Lin [off-list ref] wrote:
Jump to the existing dev_put label when devm_request_irq() fails
so drm_dev_put() and of_reserved_mem_device_release() run
instead of returning early and leaking resources.

Found via static analysis and code review.

Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin <redacted>
Patch applied to drm-misc-fixes, thanks for fixing this
obvious bug!

Yours,
Linus Walleij
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help