diff options
| author | Dan Carpenter | 2019-04-24 11:46:27 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-05-08 20:02:25 +0200 |
| commit | b72845ee5577b227131b1fef23f9d9a296621d7b (patch) | |
| tree | c4a00b157d0dcb943e8692b1c754fc2703c9eb96 | |
| parent | media: field-order.rst: clarify FIELD_ANY and FIELD_NONE (diff) | |
| download | kernel-qcow2-linux-b72845ee5577b227131b1fef23f9d9a296621d7b.tar.gz kernel-qcow2-linux-b72845ee5577b227131b1fef23f9d9a296621d7b.tar.xz kernel-qcow2-linux-b72845ee5577b227131b1fef23f9d9a296621d7b.zip | |
media: davinci/vpbe: array underflow in vpbe_enum_outputs()
In vpbe_enum_outputs() we check if (temp_index >= cfg->num_outputs) but
the problem is that "temp_index" can be negative. This patch changes
the types to unsigned to address this array underflow bug.
Fixes: 66715cdc3224 ("[media] davinci vpbe: VPBE display driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/davinci/vpbe.c | 2 | ||||
| -rw-r--r-- | include/media/davinci/vpbe.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index 8339163a5231..4e24f5d781f4 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c @@ -104,7 +104,7 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev, struct v4l2_output *output) { struct vpbe_config *cfg = vpbe_dev->cfg; - int temp_index = output->index; + unsigned int temp_index = output->index; if (temp_index >= cfg->num_outputs) return -EINVAL; diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h index 5c31a7682492..f76d2f25a824 100644 --- a/include/media/davinci/vpbe.h +++ b/include/media/davinci/vpbe.h @@ -92,7 +92,7 @@ struct vpbe_config { struct encoder_config_info *ext_encoders; /* amplifier information goes here */ struct amp_config_info *amp; - int num_outputs; + unsigned int num_outputs; /* Order is venc outputs followed by LCD and then external encoders */ struct vpbe_output *outputs; }; |