From: Mirela Rabulea Date: Tue, 8 Mar 2022 13:16:57 +0000 (+0100) Subject: media: imx-jpeg: Fix potential array out of bounds in queue_setup X-Git-Tag: v5.19-rc1~179^2~165 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e490fa1be5fe820029aa2ff2f70bcbbcebc11d28;p=tomoyo%2Ftomoyo-test1.git 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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;