ENGR00138119 MXC V4L2 capture:Check slave device attached

This patch checks slave device is attached before calling
any internal ioctrl to avoid NULL pointer de-referencing.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>

1 files changed, 184 insertions, 58 deletions

diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
index 32198e56fc1f..28b2b7826222 100644
--- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
@@ -932,42 +932,77 @@ static int mxc_v4l2_g_ctrl(cam_data *cam, struct v4l2_control *c)
 		c->value = cam->rotation;
 		break;
 	case V4L2_CID_BRIGHTNESS:
-		c->value = cam->bright;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->bright = c->value;
+		if (cam->sensor) {
+			c->value = cam->bright;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->bright = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_HUE:
-		c->value = cam->hue;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->hue = c->value;
+		if (cam->sensor) {
+			c->value = cam->hue;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->hue = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_CONTRAST:
-		c->value = cam->contrast;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->contrast = c->value;
+		if (cam->sensor) {
+			c->value = cam->contrast;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->contrast = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_SATURATION:
-		c->value = cam->saturation;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->saturation = c->value;
+		if (cam->sensor) {
+			c->value = cam->saturation;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->saturation = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_RED_BALANCE:
-		c->value = cam->red;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->red = c->value;
+		if (cam->sensor) {
+			c->value = cam->red;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->red = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_BLUE_BALANCE:
-		c->value = cam->blue;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->blue = c->value;
+		if (cam->sensor) {
+			c->value = cam->blue;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->blue = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	case V4L2_CID_BLACK_LEVEL:
-		c->value = cam->ae_mode;
-		status = vidioc_int_g_ctrl(cam->sensor, c);
-		cam->ae_mode = c->value;
+		if (cam->sensor) {
+			c->value = cam->ae_mode;
+			status = vidioc_int_g_ctrl(cam->sensor, c);
+			cam->ae_mode = c->value;
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			status = -ENODEV;
+		}
 		break;
 	default:
-		status = vidioc_int_g_ctrl(cam->sensor, c);
+		pr_err("ERROR: v4l2 capture: unsupported ioctrl!\n");
 	}
 
 	return status;
@@ -1064,46 +1099,95 @@ static int mxc_v4l2_s_ctrl(cam_data *cam, struct v4l2_control *c)
 
 		break;
 	case V4L2_CID_HUE:
-		cam->hue = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->hue = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_CONTRAST:
-		cam->contrast = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->contrast = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_BRIGHTNESS:
-		cam->bright = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->bright = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_SATURATION:
-		cam->saturation = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->saturation = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_RED_BALANCE:
-		cam->red = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->red = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_BLUE_BALANCE:
-		cam->blue = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->blue = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_EXPOSURE:
-		cam->ae_mode = c->value;
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, true, true);
-		ret = vidioc_int_s_ctrl(cam->sensor, c);
-		ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi, false, false);
+		if (cam->sensor) {
+			cam->ae_mode = c->value;
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       true, true);
+			ret = vidioc_int_s_ctrl(cam->sensor, c);
+			ipu_csi_enable_mclk_if(CSI_MCLK_I2C, cam->csi,
+					       false, false);
+		} else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			ret = -ENODEV;
+		}
 		break;
 	case V4L2_CID_MXC_FLASH:
 #ifdef CONFIG_MXC_IPU_V1
@@ -1305,6 +1389,7 @@ static int mxc_v4l2_s_std(cam_data *cam, v4l2_std_id e)
 
 	return 0;
 }
+#endif
 
 /*!
  * V4L2 - mxc_v4l2_g_std function
@@ -1323,6 +1408,7 @@ static int mxc_v4l2_g_std(cam_data *cam, v4l2_std_id *e)
 
 	pr_debug("In mxc_v4l2_g_std\n");
 
+#if 0
 	if (cam->device_type == 1) {
 		/* Use this function to get what the TV-In device detects the
 		 * format to be. pixelformat is used to return the std value
@@ -1344,8 +1430,9 @@ static int mxc_v4l2_g_std(cam_data *cam, v4l2_std_id *e)
 	}
 
 	return 0;
-}
 #endif
+}
+
 
 /*!
  * Dequeue one V4L capture buffer
@@ -1793,21 +1880,36 @@ static long mxc_v4l_do_ioctl(struct file *file,
 
 	case VIDIOC_ENUM_FMT: {
 		struct v4l2_fmtdesc *f = arg;
-		retval = vidioc_int_enum_fmt_cap(cam->sensor, f);
+		if (cam->sensor)
+			retval = vidioc_int_enum_fmt_cap(cam->sensor, f);
 #warning AG to review camera
 		//retval = mxc_v4l2_enum_fmt(cam, fd);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
 		break;
 	}
 	case VIDIOC_ENUM_FRAMESIZES: {
 		struct v4l2_frmsizeenum *fsize = arg;
-		retval = vidioc_int_enum_framesizes(cam->sensor, fsize);
+		if (cam->sensor)
+			retval = vidioc_int_enum_framesizes(cam->sensor, fsize);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
 		break;
 	}
 	case VIDIOC_DBG_G_CHIP_IDENT: {
 		struct v4l2_dbg_chip_ident *p = arg;
 		p->ident = V4L2_IDENT_NONE;
 		p->revision = 0;
-		retval = vidioc_int_g_chip_ident(cam->sensor, (int *)p);
+		if (cam->sensor)
+			retval = vidioc_int_g_chip_ident(cam->sensor, (int *)p);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
 		break;
 	}
 
@@ -1949,6 +2051,18 @@ static long mxc_v4l_do_ioctl(struct file *file,
 		break;
 	}
 
+ 	case VIDIOC_G_STD: {
+ 		v4l2_std_id *e = arg;
+ 		pr_debug("   case VIDIOC_G_STD\n");
+		if (cam->sensor)
+			retval = mxc_v4l2_g_std(cam, e);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
+ 		break;
+ 	}
+
 	/*!
 	 * V4l2 VIDIOC_S_CTRL ioctl
 	 */
@@ -2078,14 +2192,24 @@ static long mxc_v4l_do_ioctl(struct file *file,
 	case VIDIOC_G_PARM: {
 		struct v4l2_streamparm *parm = arg;
 		pr_debug("   case VIDIOC_G_PARM\n");
-		vidioc_int_g_parm(cam->sensor, parm);
+		if (cam->sensor)
+			retval = vidioc_int_g_parm(cam->sensor, parm);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
 		break;
 	}
 
 	case VIDIOC_S_PARM:  {
 		struct v4l2_streamparm *parm = arg;
 		pr_debug("   case VIDIOC_S_PARM\n");
-		retval = mxc_v4l2_s_param(cam, parm);
+		if (cam->sensor)
+			retval = mxc_v4l2_s_param(cam, parm);
+		else {
+			pr_err("ERROR: v4l2 capture: slave not found!\n");
+			retval = -ENODEV;
+		}
 		break;
 	}
 
@@ -2180,7 +2304,8 @@ static long mxc_v4l_do_ioctl(struct file *file,
 	case VIDIOC_TRY_FMT: {
 		struct v4l2_format * f = arg;
 		pr_debug("   case VIDIOC_TRY_FMT\n");
-		retval = vidioc_int_try_fmt_cap(cam->sensor,f);
+		if (cam->sensor)
+		  vidioc_int_s_power(cam->sensor, 0);
 		break;
 	}
 
@@ -2649,7 +2774,8 @@ static int mxc_v4l2_resume(struct platform_device *pdev)
 	cam->low_power = false;
 	wake_up_interruptible(&cam->power_queue);
 
-	vidioc_int_s_power(cam->sensor, 1);
+	if (cam->sensor)
+		vidioc_int_s_power(cam->sensor, 1);
 
 	if (cam->overlay_on == true)
 		start_preview(cam);