summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Chen <harperchen1110@gmail.com>2023-08-10 08:23:33 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-30 16:35:15 +0200
commit307e2b1b32692fe58dee9ae9c6aee212566e5b60 (patch)
treef77ffbf78b66917326df8ef2ccf74f6fc20e5bd8
parent9aa326a6f21df5d219ba5b37352f404388c6a379 (diff)
downloadlinux-stable-307e2b1b32692fe58dee9ae9c6aee212566e5b60.tar.gz
linux-stable-307e2b1b32692fe58dee9ae9c6aee212566e5b60.tar.bz2
linux-stable-307e2b1b32692fe58dee9ae9c6aee212566e5b60.zip
media: vcodec: Fix potential array out-of-bounds in encoder queue_setup
commit e7f2e65699e2290fd547ec12a17008764e5d9620 upstream. 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. Fixes: 4e855a6efa54 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") Signed-off-by: Wei Chen <harperchen1110@gmail.com> Cc: stable@vger.kernel.org Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 1b1a28abbf1f..a5af785fb994 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -766,6 +766,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;