summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMirela Rabulea <mirela.rabulea@oss.nxp.com>2022-03-08 14:16:57 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2022-05-13 11:02:17 +0200
commite490fa1be5fe820029aa2ff2f70bcbbcebc11d28 (patch)
treec95c87fd78d06979bca110446286e80a76f9d5d8
parentae309657b0b682e497f746ec5f3f054a2b4dc71a (diff)
media: imx-jpeg: Fix potential array out of bounds in queue_setup
Fix smatch warning in mxc_jpeg_queue_setup, check *nplanes against current format: drivers/media/platform/imx-jpeg/mxc-jpeg.c:1070 mxc_jpeg_queue_setup() warn: potential user controlled iterator 'i' (array size 2 vs 7) Signed-off-by: Mirela Rabulea <mirela.rabulea@oss.nxp.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-rw-r--r--drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 8b33a3bca867..87d91e927747 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -1081,6 +1081,8 @@ static int mxc_jpeg_queue_setup(struct vb2_queue *q,
/* Handle CREATE_BUFS situation - *nplanes != 0 */
if (*nplanes) {
+ if (*nplanes != q_data->fmt->colplanes)
+ return -EINVAL;
for (i = 0; i < *nplanes; i++) {
if (sizes[i] < q_data->sizeimage[i])
return -EINVAL;