From 907af8a8ff101281aa2914eaaeced5dfd089fb1e Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Fri, 7 May 2021 18:11:00 +0800 Subject: [PATCH] LF-2860 media: mxc_capture: Fix Coverity Issue: 17691 Dereference before null check Fix dereference before NULL check issue Signed-off-by: Robby Cai Reviewed-by: G.n. Zhou --- .../media/platform/mxc/capture/mxc_v4l2_capture.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c index 69e52840ce74..a7444ce375c7 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c @@ -2999,20 +2999,24 @@ static struct platform_driver mxc_v4l2_driver = { */ static int mxc_v4l2_master_attach(struct v4l2_int_device *slave) { - cam_data *cam = slave->u.slave->master->priv; + cam_data *cam; struct v4l2_format cam_fmt; int i; - struct sensor_data *sdata = slave->priv; + struct sensor_data *sdata; pr_debug("In MVC: mxc_v4l2_master_attach\n"); - pr_debug(" slave.name = %s\n", slave->name); - pr_debug(" master.name = %s\n", slave->u.slave->master->name); if (slave == NULL) { pr_err("ERROR: v4l2 capture: slave parameter not valid.\n"); return -1; } + pr_debug(" slave.name = %s\n", slave->name); + pr_debug(" master.name = %s\n", slave->u.slave->master->name); + + cam = slave->u.slave->master->priv; + sdata = slave->priv; + if (sdata->csi != cam->csi) { pr_debug("%s: csi doesn't match\n", __func__); return -1; -- 2.17.1