]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: staging: intel-ipu3: fix unsigned comparison with < 0
authorColin Ian King <colin.king@canonical.com>
Sat, 22 Dec 2018 11:49:51 +0000 (06:49 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 7 Feb 2019 16:58:22 +0000 (11:58 -0500)
The comparison css->pipes[pipe].bindex < 0 is always false because
bindex is an unsigned int.  Fix this by using a signed integer for
the comparison.

Detected by CoverityScan, CID#1476023 ("Unsigned compared against 0")

Fixes: f5f2e4273518 ("media: staging/intel-ipu3: Add css pipeline programming")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/staging/media/ipu3/ipu3-css.c

index 44c55639389aaf58f8013a0d1c0f0f14a327aa92..b9354d2bb69251fef6551f7c39362027fabf0f25 100644 (file)
@@ -1751,7 +1751,7 @@ int ipu3_css_fmt_try(struct ipu3_css *css,
                                        &q[IPU3_CSS_QUEUE_OUT].fmt.mpix;
        struct v4l2_pix_format_mplane *const vf =
                                        &q[IPU3_CSS_QUEUE_VF].fmt.mpix;
-       int i, s;
+       int i, s, ret;
 
        /* Adjust all formats, get statistics buffer sizes and formats */
        for (i = 0; i < IPU3_CSS_QUEUES; i++) {
@@ -1826,12 +1826,12 @@ int ipu3_css_fmt_try(struct ipu3_css *css,
        s = (bds->height - gdc->height) / 2 - FILTER_SIZE;
        env->height = s < MIN_ENVELOPE ? MIN_ENVELOPE : s;
 
-       css->pipes[pipe].bindex =
-               ipu3_css_find_binary(css, pipe, q, r);
-       if (css->pipes[pipe].bindex < 0) {
+       ret = ipu3_css_find_binary(css, pipe, q, r);
+       if (ret < 0) {
                dev_err(css->dev, "failed to find suitable binary\n");
                return -EINVAL;
        }
+       css->pipes[pipe].bindex = ret;
 
        dev_dbg(css->dev, "Binary index %d for pipe %d found.",
                css->pipes[pipe].bindex, pipe);