Merge "msm: vidc: Add check to avoid NULL ptr dereference" (31f1acd9) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_vidc.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1390,6 +1390,7 @@ static int msm_vidc_op_s_ctrl(struct v4l2_ctrl *ctrl)
		int rc = 0;
		unsigned int c = 0;
		struct msm_vidc_inst *inst;
		const char *ctrl_name = NULL;

		if (!ctrl) {
		dprintk(VIDC_ERR, "%s invalid parameters for ctrl\n", __func__);
		@@ -1413,9 +1414,12 @@ static int msm_vidc_op_s_ctrl(struct v4l2_ctrl *ctrl)
		}
		}
		}
		if (rc)
		if (rc) {
		ctrl_name = v4l2_ctrl_get_name(ctrl->id);
		dprintk(VIDC_ERR, "Failed setting control: Inst = %pK (%s)\n",
		inst, v4l2_ctrl_get_name(ctrl->id));
		inst, ctrl_name ? ctrl_name : "Invalid ctrl");
		}

		return rc;
		}