Skip to content

Commit 14ddccc

Browse files
committed
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
2 parents f8d6ff4 + e7f2e65 commit 14ddccc

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,8 @@ static int vb2ops_venc_queue_setup(struct vb2_queue *vq,
821821
return -EINVAL;
822822

823823
if (*nplanes) {
824+
if (*nplanes != q_data->fmt->num_planes)
825+
return -EINVAL;
824826
for (i = 0; i < *nplanes; i++)
825827
if (sizes[i] < q_data->sizeimage[i])
826828
return -EINVAL;

0 commit comments

Comments
 (0)