video: fbdev: exynos: dpu9110: fix null pointer deference for recovery_cnt

There is no drvdata for specific instance of dpp when it is not
assigned from dt, and accessing it without null check causes null
pointer deference. Fix the null pointer defercens when accessing
recovery_cnt.

Change-Id: Ie57024101d461b1135f341bd1f76b55d0d77ec73
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/video/fbdev/exynos/dpu_9110/dpp_drv.c b/drivers/video/fbdev/exynos/dpu_9110/dpp_drv.c
index 19c6bfdf7fc28bcfad711c51def4682afc4def43..939b0624c29d6b329babf6099628a5f9231b4902 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu_9110/dpp_drv.c
+++ b/drivers/video/fbdev/exynos/dpu_9110/dpp_drv.c
@@ -825,8 +825,12 @@ static irqreturn_t dma_irq_handler(int irq, void *priv)
                dpp_info("dma%d recovery start(0x%x).. [src=%s], cnt[%d %d]\n",
                                dpp->id, irqs,
                                val == DPP_COMP_SRC_G2D ? "G2D" : "GPU",
-                               get_dpp_drvdata(IDMA_VGF0)->d.recovery_cnt,
-                               get_dpp_drvdata(IDMA_VGF1)->d.recovery_cnt);
+                               (get_dpp_drvdata(IDMA_VGF0) ?
+                                get_dpp_drvdata(IDMA_VGF0)->d.recovery_cnt :
+                                0),
+                               (get_dpp_drvdata(IDMA_VGF1) ?
+                                get_dpp_drvdata(IDMA_VGF1)->d.recovery_cnt :
+                                0));
                goto irq_end;
        }
 

diff --git a/drivers/video/fbdev/exynos/dpu_9110/event_log.c b/drivers/video/fbdev/exynos/dpu_9110/event_log.c
index ea516a60a1704efdce1f0fe6330231190bedc541..f65e284bc7c0045650efe057d718a03985cf2038 100755 (executable)
--- a/drivers/video/fbdev/exynos/dpu_9110/event_log.c
+++ b/drivers/video/fbdev/exynos/dpu_9110/event_log.c
@@ -903,8 +903,10 @@ static const struct file_operations decon_cmd_lp_ref_fops = {
 static int decon_debug_rec_show(struct seq_file *s, void *unused)
 {
        seq_printf(s, "VGF0[%u] VGF1[%u]\n",
-                       get_dpp_drvdata(IDMA_VGF0)->d.recovery_cnt,
-                       get_dpp_drvdata(IDMA_VGF1)->d.recovery_cnt);
+                       (get_dpp_drvdata(IDMA_VGF0) ?
+                        get_dpp_drvdata(IDMA_VGF0)->d.recovery_cnt : 0),
+                       (get_dpp_drvdata(IDMA_VGF1) ?
+                        get_dpp_drvdata(IDMA_VGF1)->d.recovery_cnt : 0));
        return 0;
 }