From c32df7879dd8a62cefe2b6ae5cccbe4f2c8e1625 Mon Sep 17 00:00:00 2001 From: Satya Rama Aditya Pinapala Date: Sat, 3 Aug 2019 12:52:22 -0700 Subject: [PATCH] disp: msm: dsi: add check to avoid null pointer access Add a check for valid pointer in the DSI CTRL logging macros to fix null pointer access issues. Change-Id: I92576e1db6c2d8b52c2adddd8c964bc2455536e4 Signed-off-by: Satya Rama Aditya Pinapala --- msm/dsi/dsi_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c index 1ab88333fd..599e8a9f5e 100644 --- a/msm/dsi/dsi_ctrl.c +++ b/msm/dsi/dsi_ctrl.c @@ -33,13 +33,13 @@ #define TICKS_IN_MICRO_SECOND 1000000 #define DSI_CTRL_DEBUG(c, fmt, ...) DRM_DEV_DEBUG(NULL, "[msm-dsi-debug]: %s: "\ - fmt, c->name, ##__VA_ARGS__) + fmt, c ? c->name : "inv", ##__VA_ARGS__) #define DSI_CTRL_ERR(c, fmt, ...) DRM_DEV_ERROR(NULL, "[msm-dsi-error]: %s: "\ - fmt, c->name, ##__VA_ARGS__) + fmt, c ? c->name : "inv", ##__VA_ARGS__) #define DSI_CTRL_INFO(c, fmt, ...) DRM_DEV_INFO(NULL, "[msm-dsi-info]: %s: "\ fmt, c->name, ##__VA_ARGS__) #define DSI_CTRL_WARN(c, fmt, ...) DRM_WARN("[msm-dsi-warn]: %s: " fmt,\ - c->name, ##__VA_ARGS__) + c ? c->name : "inv", ##__VA_ARGS__) struct dsi_ctrl_list_item { struct dsi_ctrl *ctrl;