From 9e23c810d58910565767549d3692208a085f8add Mon Sep 17 00:00:00 2001 From: Andreas Pokorny Date: Sat, 6 Oct 2018 15:33:47 +0200 Subject: [PATCH] Fix null pointer access inside msm camera Change-Id: I29f3f200d7c7760c1cdd50f95973a3729d6f8380 --- drivers/media/platform/msm/camera_v1/msm_mctl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/platform/msm/camera_v1/msm_mctl.c b/drivers/media/platform/msm/camera_v1/msm_mctl.c index 7c0ecf09320a32..b3bb7529696420 100644 --- 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__);