瀏覽代碼

disp: msm: sde: fix possible null pointer dereference

Fix a possible uninitialized variable usage in sde
catalog and a null pointer dereference in sde crtc.

Change-Id: I4299ade65fa7cf5bfc3d60d6d7a368d523286626
Signed-off-by: Veera Sundaram Sankaran <[email protected]>
Veera Sundaram Sankaran 5 年之前
父節點
當前提交
6575366a16
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 1
      msm/sde/sde_crtc.c
  2. 1 0
      msm/sde/sde_hw_catalog.c

+ 2 - 1
msm/sde/sde_crtc.c

@@ -1299,7 +1299,8 @@ static void _sde_crtc_set_src_split_order(struct drm_crtc *crtc,
 		prv_pstate = (i > 0) ? &pstates[i - 1] : NULL;
 		cur_pstate = &pstates[i];
 		nxt_pstate = ((i + 1) < cnt) ? &pstates[i + 1] : NULL;
-		prev_layout = prv_pstate->sde_pstate->layout;
+		prev_layout = prv_pstate ? prv_pstate->sde_pstate->layout :
+							SDE_LAYOUT_NONE;
 		cur_layout = cur_pstate->sde_pstate->layout;
 
 		if ((!prv_pstate) || (prv_pstate->stage != cur_pstate->stage)

+ 1 - 0
msm/sde/sde_hw_catalog.c

@@ -3010,6 +3010,7 @@ static int sde_vdc_parse_dt(struct device_node *np,
 		rc = 0;
 	} else {
 		SDE_ERROR("invalid vdc configuration\n");
+		goto end;
 	}
 
 	rc = _read_dt_entry(np, vdc_prop, ARRAY_SIZE(vdc_prop), prop_count,