From 3d767fbf51834b337a9afbfcdb90b8fca3c06fa4 Mon Sep 17 00:00:00 2001
From: "Guoniu.Zhou" <guoniu.zhou@nxp.com>
Date: Wed, 3 Apr 2019 16:21:56 +0800
Subject: [PATCH] MLK-20191-2: media: mxc: fix potential null pointer
dereferencing
CID 17797 and 3275140: fix potential null pointer dereferencing.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
---
drivers/media/platform/mxc/capture/mxc_v4l2_capture.c | 2 +-
drivers/media/platform/mxc/capture/ov5640_mipi_v2.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
index b5b03169bfe19..dd9b860e59376 100644
--- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
@@ -579,7 +579,7 @@ static int verify_preview(cam_data *cam, struct v4l2_window *win)
}
} while (++i < FB_MAX);
- if (foregound_fb) {
+ if (foregound_fb && bg_fbi) {
width_bound = bg_fbi->var.xres;
height_bound = bg_fbi->var.yres;
diff --git a/drivers/media/platform/mxc/capture/ov5640_mipi_v2.c b/drivers/media/platform/mxc/capture/ov5640_mipi_v2.c
index 1cb3d69918f46..45abed4ae349d 100644
--- a/drivers/media/platform/mxc/capture/ov5640_mipi_v2.c
+++ b/drivers/media/platform/mxc/capture/ov5640_mipi_v2.c
@@ -1376,6 +1376,7 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
if (!fmt) {
mf->code = ov5640_colour_fmts[0].code;
mf->colorspace = ov5640_colour_fmts[0].colorspace;
+ fmt = &ov5640_colour_fmts[0];
}
mf->field = V4L2_FIELD_NONE;
--
GitLab