Commit 8fbcf730 authored by Wei Chen's avatar Wei Chen Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarWei Chen <harperchen1110@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent e2a10b38

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -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;