drm/bridge: panel: Prevent ERR_PTR Dereference
Subsystems (3)
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.
--- drivers/gpu/drm/bridge/panel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/panel.c +5 -4
@@ -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
Hi Maxime,
Thank you for the patch.
Quoted 8 lines · Maxime Ripard
Commit
5ea6b1702781("drm/panel: Addprepare_prev_firstflag todrm_panel") introduced an access to the bridge pointer in thedevm_drm_panel_bridge_add_typed()function.However, due to the unusual
ERR_PTRcheck 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_PTRso that we never access the pointer in that case.Fixes 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
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@@ -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
Quoted 8 lines · Maxime Ripard
Commit
5ea6b1702781("drm/panel: Addprepare_prev_firstflag todrm_panel") introduced an access to the bridge pointer in thedevm_drm_panel_bridge_add_typed()function.However, due to the unusual
ERR_PTRcheck 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_PTRso that we never access the pointer in that case.Fixes 5ea6b1702781 ("drm/panel: Add prepare_prev_first flag to drm_panel")Reported-by kernel test robot <[email protected]>Reported-by Dan Carpenter <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
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@@ -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);
Maxime Ripard
AppliedRe: (subset) [PATCH] drm/bridge: panel: Prevent ERR_PTR Dereference
In reply to Maxime RipardQuoted 9 lines · Maxime Ripard
Commit
5ea6b1702781("drm/panel: Addprepare_prev_firstflag todrm_panel") introduced an access to the bridge pointer in thedevm_drm_panel_bridge_add_typed()function.However, due to the unusual
ERR_PTRcheck 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