Commit 14ddccc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fix from Mauro Carvalho Chehab:
 "Fix a potential array out-of-bounds in the mediatek vcodec driver"

* tag 'media/v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: vcodec: Fix potential array out-of-bounds in encoder queue_setup
parents f8d6ff44 e7f2e656

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

+2 −0
Original line number Diff line number Diff line
@@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq, 
		return -EINVAL;



	if (*nplanes) {

		if (*nplanes != q_data->fmt->num_planes)

			return -EINVAL;

		for (i = 0; i < *nplanes; i++)

			if (sizes[i] < q_data->sizeimage[i])

				return -EINVAL;