Merge "msm: mdss: fix null pointer if wrong params passed on esd config" (d6684499) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdss_dsi_host.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1134,6 +1134,11 @@ static int mdss_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl)
		rc = 1;
		lenp = ctrl->status_valid_params ?: ctrl->status_cmds_rlen;

		if (!lenp \|\| !ctrl->status_cmds_rlen) {
		pr_err("invalid dsi read params!\n");
		return 0;
		}

		for (i = 0; i < ctrl->status_cmds.cmd_cnt; ++i) {
		memset(&cmdreq, 0, sizeof(cmdreq));
		cmdreq.cmds = ctrl->status_cmds.cmds + i;

+12 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@
		#ifdef TARGET_HW_MDSS_HDMI
		#include "mdss_dba_utils.h"
		#endif
		#include "mdss_debug.h"

		#define DT_CMD_HDR 6
		#define MIN_REFRESH_RATE 48
		#define DEFAULT_MDP_TRANSFER_TIME 14000
		@@ -1683,7 +1685,7 @@ static int mdss_dsi_parse_reset_seq(struct device_node *np,

		static bool mdss_dsi_cmp_panel_reg_v2(struct mdss_dsi_ctrl_pdata *ctrl)
		{
		int i, j;
		int i, j = 0;
		int len = 0, *lenp;
		int group = 0;

		@@ -1692,6 +1694,15 @@ static bool mdss_dsi_cmp_panel_reg_v2(struct mdss_dsi_ctrl_pdata *ctrl)
		for (i = 0; i < ctrl->status_cmds.cmd_cnt; i++)
		len += lenp[i];

		for (i = 0; i < len; i++) {
		pr_debug("[%i] return:0x%x status:0x%x\n",
		i, (unsigned int)ctrl->return_buf[i],
		(unsigned int)ctrl->status_value[j + i]);
		MDSS_XLOG(ctrl->ndx, ctrl->return_buf[i],
		ctrl->status_value[j + i]);
		j += len;
		}

		for (j = 0; j < ctrl->groups; ++j) {
		for (i = 0; i < len; ++i) {
		if (ctrl->return_buf[i] !=