Merge "msm: mdss: prevent crash in null commit use case" (3b0aeb59) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_layer.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -236,8 +236,8 @@ static int __layer_param_check(struct msm_fb_data_type *mfd,
		}

		if (CHECK_LAYER_BOUNDS(layer->dst_rect.y, layer->dst_rect.h, yres)) {
		pr_err("invalid vertical destination: y=%d, h=%d\n",
		layer->dst_rect.y, layer->dst_rect.h);
		pr_err("invalid vertical destination: y=%d, h=%d, yres=%d\n",
		layer->dst_rect.y, layer->dst_rect.h, yres);
		return -EOVERFLOW;
		}

		@@ -1446,6 +1446,12 @@ int mdss_mdp_layer_pre_commit_wfd(struct msm_fb_data_type *mfd,
		goto fence_get_err;
		}
		}
		} else {
		wfd = mdp5_data->wfd;
		if (!wfd->ctl \|\| !wfd->ctl->wb) {
		pr_err("wfd commit with null out layer and no validate\n");
		return -EINVAL;
		}
		}

		rc = mdss_mdp_layer_pre_commit(mfd, file, commit);