Merge "drm/msm/dsi-staging: Fix buffer overflow and Null pointer dereference" (a872672c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1791,7 +1791,8 @@ static void dsi_config_host_engine_state_for_cont_splash
		enum dsi_engine_state host_state = DSI_CTRL_ENGINE_ON;

		/* Sequence does not matter for split dsi usecases */
		for (i = 0; i < display->ctrl_count; i++) {
		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		ctrl = &display->ctrl[i];
		if (!ctrl->ctrl)
		continue;
		@@ -3958,8 +3959,13 @@ int dsi_display_cont_splash_config(void *dsi_display)
		struct dsi_display *display = dsi_display;
		int rc = 0;

		if (!display) {
		pr_err("Invalid display\n");
		return -EINVAL;
		}

		/* Continuous splash not supported by external bridge */
		if (!display \|\| dsi_display_has_ext_bridge(display)) {
		if (dsi_display_has_ext_bridge(display)) {
		display->is_cont_splash_enabled = false;
		return 0;
		}