drm: panel-lvds: Potential Oops in probe error handling
Subsystems (5)
PATCH v3 1/1 drm: panel-lvds: Potential Oops in probe error handling
The "lvds->backlight" pointer could be NULL in situations where of_parse_phandle() returns NULL. This code is cleaner if we use the managed devm_of_find_backlight() so the clean up is automatic.
---
v3: Use devm_of_find_backlight(). This version is quite a bit more
ambitious, and I haven't tested it so please review carefully.
v2: Use backlight_put()
drivers/gpu/drm/panel/panel-lvds.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/gpu/drm/panel/panel-lvds.c +4 -17
@@ -197,7 +197,6 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)static int panel_lvds_probe (struct platform_device *pdev) {struct panel_lvds *lvds; -struct device_node *np;int ret; lvds =devm_kzalloc (&pdev->dev,sizeof (*lvds),GFP_KERNEL );
@@ -243,14 +242,9 @@ static int panel_lvds_probe(struct platform_device *pdev)return ret; } - np =of_parse_phandle (lvds->dev->of_node,"backlight" ,0 ); -if (np) { - lvds->backlight =of_find_backlight_by_node (np); -of_node_put (np); - -if (!lvds->backlight) -return -EPROBE_DEFER ; - } + lvds->backlight =devm_of_find_backlight (lvds->dev); +if (IS_ERR (lvds->backlight)) +return PTR_ERR (lvds->backlight);/* * TODO: Handle all power supplies specified in the DT node in a generic
@@ -266,14 +260,10 @@ static int panel_lvds_probe(struct platform_device *pdev) ret =drm_panel_add (&lvds->panel);if (ret <0 ) - goto error; +return ret;dev_set_drvdata (lvds->dev, lvds);return 0 ; - -error: -put_device (&lvds->backlight->dev); -return ret; }static int panel_lvds_remove (struct platform_device *pdev)
@@ -284,9 +274,6 @@ static int panel_lvds_remove(struct platform_device *pdev)panel_lvds_disable (&lvds->panel); -if (lvds->backlight) -put_device (&lvds->backlight->dev); -return 0 ; }
Signature · 1 line
2.20.1
Hi Dan.
Quoted 9 lines · Dan Carpenter
The "
lvds->backlight" pointer could be NULL in situations whereof_parse_phandle()returns NULL. This code is cleaner if we use the manageddevm_of_find_backlight()so the clean up is automatic.Fixes 7c9dff5bd643 ("drm: panels: Add LVDS panel driver")Signed-off-by Dan Carpenter <[email protected]>---
v3: Usedevm_of_find_backlight(). This version is quite a bit more
ambitious, and I haven't tested it so please review carefully.
Looks good.
Applied and pushed to drm-misc-next.
It will hit upstream not at this but next merge window.
Sam