media: mediatek: vcodec: Fix potential array out-of-bounds in decoder queue_setup

[ Upstream commit 8fbcf730cb89c3647f3365226fe7014118fa93c7 ]

variable *nplanes is provided by user via system call argument. The
possible value of q_data->fmt->num_planes is 1-3, while the value
of *nplanes can be 1-8. The array access by index i can cause array
out-of-bounds.

Fix this bug by checking *nplanes against the array size.

Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
index c99705681a03e9ed0c939f9abe6c79b5e6d69dbe..93fcea821001fb60d9cdd913cbcb3f9a189ea043 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
@@ -735,6 +735,13 @@ int vb2ops_vdec_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
        }
 
        if (*nplanes) {
+               if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+                       if (*nplanes != q_data->fmt->num_planes)
+                               return -EINVAL;
+               } else {
+                       if (*nplanes != 1)
+                               return -EINVAL;
+               }
                for (i = 0; i < *nplanes; i++) {
                        if (sizes[i] < q_data->sizeimage[i])
                                return -EINVAL;