Merge "msm: camera: cpp: Validate frame message before manipulating it." (37e32a77) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+12 −14

Original line number	Diff line number	Diff line
		@@ -2405,7 +2405,6 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev,
		return -EINVAL;
		}

		if (!new_frame->partial_frame_indicator) {
		if (cpp_frame_msg[new_frame->msg_len - 1] !=
		MSM_CPP_MSG_ID_TRAILER) {
		pr_err("Invalid frame message\n");
		@@ -2420,7 +2419,6 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev,
		new_frame->num_strips * stripe_size + 1));
		return -EINVAL;
		}
		}

		if (cpp_dev->iommu_state != CPP_IOMMU_STATE_ATTACHED) {
		pr_err("IOMMU is not attached\n");