Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1b63b9c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Fix potential NULL pointer dereferences"

parents d4a2f916 50569ee3

drivers/video/msm/mdss/mdss_debug.c

+2 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static ssize_t panel_debug_base_reg_write(struct file *file, 
			break;

		}

		/* End of a hex value in given string */

		if ((bufp + NEXT_VALUE_OFFSET - 1) < (buf + count))

			bufp[NEXT_VALUE_OFFSET - 1] = 0;

	}

	if (len < PANEL_CMD_MIN_TX_COUNT) {

drivers/video/msm/mdss/mdss_mdp.c

+9 −6
Original line number Diff line number Diff line
@@ -3234,12 +3234,15 @@ static int mdss_mdp_parse_dt_pipe(struct platform_device *pdev) 
	mdata->has_panic_ctrl = of_property_read_bool(pdev->dev.of_node,

		"qcom,mdss-has-panic-ctrl");

	if (mdata->has_panic_ctrl) {

		if (mdata->vig_pipes)

			mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,

				"qcom,mdss-pipe-vig-panic-ctrl-offsets",

				mdata->vig_pipes, mdata->nvig_pipes);

		if (mdata->rgb_pipes)

			mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,

				"qcom,mdss-pipe-rgb-panic-ctrl-offsets",

				mdata->rgb_pipes, mdata->nrgb_pipes);

		if (mdata->dma_pipes)

			mdss_mdp_parse_dt_pipe_panic_ctrl(pdev,

				"qcom,mdss-pipe-dma-panic-ctrl-offsets",

				mdata->dma_pipes, mdata->ndma_pipes);