Skip to contentSkip to conversation

drm/msm: Fix null pointer dereference on pointer edp

PATCH In review Colin King 2 participants 2 messages Sep 29, 2021 – Oct 1, 2021

Subsystems (4)
lore
Share & tools
lore

Colin King

author
#0 lore raw

PATCH 1/1 drm/msm: Fix null pointer dereference on pointer edp

From: Colin Ian King <[email protected]>

The initialization of pointer dev dereferences pointer edp before edp is null checked, so there is a potential null pointer deference issue. Fix this by only dereferencing edp after edp has been null checked.

Addresses-Coverity: ("Dereference before null check")

Fixes ab5b0107ccf3 ("drm/msm: Initial add eDP support in msm drm driver (v5)")
---
 drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/edp/edp_ctrl.c +2 -1
index 4fb397ee7c84..fe1366b4c49f 100644
@@ -1116,7 +1116,7 @@ void msm_edp_ctrl_power(struct edp_ctrl *ctrl, bool on)
 int msm_edp_ctrl_init(struct msm_edp *edp)
 {
 	struct edp_ctrl *ctrl = NULL;
-	struct device *dev = &edp->pdev->dev;
+	struct device *dev;
 	int ret;
 
 	if (!edp) {
@@ -1124,6 +1124,7 @@ int msm_edp_ctrl_init(struct msm_edp *edp)
 		return -EINVAL;
 	}
 
+	dev = &edp->pdev->dev;
 	ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
 	if (!ctrl)
 		return -ENOMEM;
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Colin King

From: Colin Ian King <[email protected]>

The initialization of pointer dev dereferences pointer edp before edp is null checked, so there is a potential null pointer deference issue. Fix this by only dereferencing edp after edp has been null checked.

Addresses-Coverity: ("Dereference before null check")

Fixes ab5b0107ccf3 ("drm/msm: Initial add eDP support in msm drm driver (v5)")
Quoted 26 lines
---
  drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/edp/edp_ctrl.c +2 -1
index 4fb397ee7c84..fe1366b4c49f 100644
@@ -1116,7 +1116,7 @@ void msm_edp_ctrl_power(struct edp_ctrl *ctrl, bool on)
  int msm_edp_ctrl_init(struct msm_edp *edp)
  {
  	struct edp_ctrl *ctrl = NULL;
-	struct device *dev = &edp->pdev->dev;
+	struct device *dev;
  	int ret;
 
  	if (!edp) {
@@ -1124,6 +1124,7 @@ int msm_edp_ctrl_init(struct msm_edp *edp)
  		return -EINVAL;
  	}
 
+	dev = &edp->pdev->dev;
  	ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
  	if (!ctrl)
  		return -ENOMEM;
Signature · 2 lines
With best wishes
Dmitry