Fix null pointer access inside msm camera

Change-Id: I29f3f200d7c7760c1cdd50f95973a3729d6f8380
shr-distribution · Oct 6, 2018 · 9e23c81 · 9e23c81
1 parent 5f96723
commit 9e23c81
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/drivers/media/platform/msm/camera_v1/msm_mctl.c b/drivers/media/platform/msm/camera_v1/msm_mctl.c
@@ -878,8 +878,17 @@ static int msm_mctl_dev_close(struct file *f)
 	struct msm_cam_v4l2_device *pcam;
 	struct msm_cam_v4l2_dev_inst *pcam_inst;
 	struct msm_cam_media_controller *pmctl;
+
+        if (f == NULL) {
+		pr_err("%s :: cannot close video driver", __func__);
+		return -EINVAL;
+	}
 	pcam_inst = container_of(f->private_data,
 		struct msm_cam_v4l2_dev_inst, eventHandle);
+	if (!pcam_inst) {
+		pr_err("%s NULL pointer of container!\n", __func__);
+		return -EINVAL;
+	}
 	pcam = pcam_inst->pcam;
 
 	D("%s : E ", __func__);