Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 3 messages Aug 24, 2023 – Aug 25, 2023 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author maintainer
#0 lore raw

Hi Linus,

Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-4

For a potential array out-of-bounds at the mediatek's vcodec driver.

Thanks!
Mauro

The following changes since commit 2908042a37b56d6a9a595eca946e187e9d2df39a:

media: imx: imx7-media-csi: Fix applying format constraints (2023-08-09 13:31:37 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-4

for you to fetch changes up to e7f2e65699e2290fd547ec12a17008764e5d9620:

media: vcodec: Fix potential array out-of-bounds in encoder queue_setup (2023-08-23 09:56:08 +0200)

----------------------------------------------------------------
media fixes for v6.5-rc8

----------------------------------------------------------------
Wei Chen (1):
media: vcodec: Fix potential array out-of-bounds in encoder queue_setup

 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
 1 file changed, 2 insertions(+)
#1 lore raw

Re: [GIT PULL for v6.5] media fixes (#94321)

From: [email protected]

Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
Build log: https://builder.linuxtv.org/job/patchwork/333715/
Build time: 00:00:00

gpg: Signature made Thu 24 Aug 2023 11:52:18 PM UTC
gpg:                using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "[jpeg image of size 3594]" [ultimate]

Build aborted due to a fatal error:
FAILED: patch patch patches/0001-media-vcodec-Fix-potential-array-out-of-bounds-in-en.patch doesn't apply:
Applying patch patches/0001-media-vcodec-Fix-potential-array-out-of-bounds-in-en.patch can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

|From e7f2e65699e2290fd547ec12a17008764e5d9620 Mon Sep 17 00:00:00 2001
|From: Wei Chen <[email protected]>
|Date: Thu, 10 Aug 2023 08:23:33 +0000
|Subject: media: vcodec: Fix potential array out-of-bounds in encoder
| 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.
|
|Fixes: 4e855a6efa54 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver")
|Signed-off-by: Wei Chen <[email protected]>
|Cc: [email protected]
|Reviewed-by: Chen-Yu Tsai <[email protected]>
|Signed-off-by: Hans Verkuil <[email protected]>
|---
| drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 ++
| 1 file changed, 2 insertions(+)
|
|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

--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
Patch patches/0001-media-vcodec-Fix-potential-array-out-of-bounds-in-en.patch does not apply (enforce with -f)

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Fri, 25 Aug 2023 01:54:19 +0200:

The pull request you sent on Fri, 25 Aug 2023 01:54:19 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/14ddccc8a647f0e6b268858c4fe2804ae42aabb0

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html