Merge "msm: cpp: Do not free stripe info pointer allocated by backend" (4fe4c046) · Commits · e / devices / android_kernel_sony_msm8994

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -2877,14 +2877,14 @@ static struct msm_cpp_frame_info_t *get_64bit_cpp_frame_from_compat(
		(new_frame->msg_len > MSM_CPP_MAX_FRAME_LENGTH)) {
		pr_err("%s:%d: Invalid frame len:%d\n", __func__,
		__LINE__, new_frame->msg_len);
		goto strip_err;
		goto frame_err;
		}

		cpp_frame_msg = kzalloc(sizeof(uint32_t)*new_frame->msg_len,
		GFP_KERNEL);
		if (!cpp_frame_msg) {
		pr_err("Insufficient memory\n");
		goto strip_err;
		goto frame_err;
		}

		rc = (copy_from_user(cpp_frame_msg,
		@@ -2901,8 +2901,6 @@ static struct msm_cpp_frame_info_t *get_64bit_cpp_frame_from_compat(

		frame_msg_err:
		kfree(cpp_frame_msg);
		strip_err:
		kfree(new_frame->strip_info);
		frame_err:
		kfree(new_frame);
		no_mem: