media: imx: Validate frame intervals before setting

In the .s_frame_interval() subdev op, don't accept or set a
frame interval with a zero numerator or denominator. This fixes
a v4l2-compliance failure:

fail: v4l2-test-formats.cpp(1146):
cap->timeperframe.numerator == 0 || cap->timeperframe.denominator == 0
test VIDIOC_G/S_PARM: FAIL

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index 98923fc844cef32e6e4744d7774a02a64648f98c..a2bb5c702d748920357f436c6e8bb9c55979ef85 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prp.c
+++ b/drivers/staging/media/imx/imx-ic-prp.c
@@ -422,9 +422,14 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,
        if (fi->pad >= PRP_NUM_PADS)
                return -EINVAL;
 
-       /* No limits on frame interval */
        mutex_lock(&priv->lock);
-       priv->frame_interval = fi->interval;
+
+       /* No limits on valid frame intervals */
+       if (fi->interval.numerator == 0 || fi->interval.denominator == 0)
+               fi->interval = priv->frame_interval;
+       else
+               priv->frame_interval = fi->interval;
+
        mutex_unlock(&priv->lock);
 
        return 0;

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 3637693c2bc88f27e2cd94808e9433e66e3722a4..376b504e8a423fe98494750ae5b1c3c1ae0783ae 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -1222,9 +1222,14 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,
        if (fi->pad >= PRPENCVF_NUM_PADS)
                return -EINVAL;
 
-       /* No limits on frame interval */
        mutex_lock(&priv->lock);
-       priv->frame_interval = fi->interval;
+
+       /* No limits on valid frame intervals */
+       if (fi->interval.numerator == 0 || fi->interval.denominator == 0)
+               fi->interval = priv->frame_interval;
+       else
+               priv->frame_interval = fi->interval;
+
        mutex_unlock(&priv->lock);
 
        return 0;

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index d851ca2497b4aa4d5e141cf23d369097c8e53f31..fb5307e2ca4375b9a187d62c1c846e6f06bdd2af 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -926,7 +926,10 @@ static int csi_s_frame_interval(struct v4l2_subdev *sd,
 
        switch (fi->pad) {
        case CSI_SINK_PAD:
-               /* No limits on input frame interval */
+               /* No limits on valid input frame intervals */
+               if (fi->interval.numerator == 0 ||
+                   fi->interval.denominator == 0)
+                       fi->interval = *input_fi;
                /* Reset output intervals and frame skipping ratio to 1:1 */
                priv->frame_interval[CSI_SRC_PAD_IDMAC] = fi->interval;
                priv->frame_interval[CSI_SRC_PAD_DIRECT] = fi->interval;

diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index 297951d98ab50c0bba5ffb7e57ece97edfcf8bb9..2808662e2597726dc1b074f5ea0bce8ebdcd038c 100644 (file)
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -818,7 +818,10 @@ static int vdic_s_frame_interval(struct v4l2_subdev *sd,
        switch (fi->pad) {
        case VDIC_SINK_PAD_DIRECT:
        case VDIC_SINK_PAD_IDMAC:
-               /* No limits on input frame interval */
+               /* No limits on valid input frame intervals */
+               if (fi->interval.numerator == 0 ||
+                   fi->interval.denominator == 0)
+                       fi->interval = priv->frame_interval[fi->pad];
                /* Reset output interval */
                *output_fi = fi->interval;
                if (priv->csi_direct)