diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-24 19:10:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-24 19:10:53 -0700 |
| commit | 14ddccc8a647f0e6b268858c4fe2804ae42aabb0 (patch) | |
| tree | 1dc08f065b380e1dc286477e22fe34ec53d92238 | |
| parent | f8d6ff449094b4b5eff40d4af08e47c520b78bc5 (diff) | |
| parent | e7f2e65699e2290fd547ec12a17008764e5d9620 (diff) | |
| download | lwn-14ddccc8a647f0e6b268858c4fe2804ae42aabb0.tar.gz lwn-14ddccc8a647f0e6b268858c4fe2804ae42aabb0.zip | |
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
| -rw-r--r-- | drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index 9ff439a50f53..315e97a2450e 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -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; |