Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 3 messages Oct 1, 2022 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.0-1

For:
- some fixes at the v4l2 ioctl handler logic;
- a fix for an out of bound access at DVB videobuf2 handler;
- 3 driver fixes (rkvdec, mediatek/vcodek and uvcvideo).

Regards,
Mauro

---

The following changes since commit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868:

Linux 6.0-rc1 (2022-08-14 15:50:18 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.0-1

for you to fetch changes up to 3a99c4474112f49a5459933d8758614002ca0ddc:

media: rkvdec: Disable H.264 error detection (2022-09-27 10:24:44 +0200)

----------------------------------------------------------------
media fixes for v6.0-rc8

----------------------------------------------------------------
Hangyu Hua (1):
media: dvb_vb2: fix possible out of bound access

Hans Verkuil (2):
media: v4l2-compat-ioctl32.c: zero buffer passed to v4l2_compat_get_array_args()
media: v4l2-ioctl.c: fix incorrect error path

Nicolas Dufresne (1):
media: rkvdec: Disable H.264 error detection

Nícolas F. R. A. Prado (1):
media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ)

Ricardo Ribalda (1):
media: uvcvideo: Fix InterfaceProtocol for Quanta camera

 drivers/media/dvb-core/dvb_vb2.c                   | 11 +++++++++
 .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c  |  9 +++-----
 drivers/media/usb/uvc/uvc_driver.c                 |  2 +-
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |  2 ++
 drivers/media/v4l2-core/v4l2-ioctl.c               | 26 ++++++++++------------
 drivers/staging/media/rkvdec/rkvdec-h264.c         |  4 ++--
 6 files changed, 31 insertions(+), 23 deletions(-)
#1 lore raw

Re: [GIT PULL for v6.0] media fixes (#86466)

From: [email protected]

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

gpg: Signature made Sat 01 Oct 2022 05:08:37 AM 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/0003-media-v4l2-ioctl.c-fix-incorrect-error-path.patch doesn't apply:
Applying patch patches/0003-media-v4l2-ioctl.c-fix-incorrect-error-path.patch patching file drivers/media/v4l2-core/v4l2-ioctl.c
Hunk #1 FAILED at 2872.
Hunk #2 FAILED at 3367.
Hunk #3 FAILED at 3377.
Hunk #4 succeeded at 3401 with fuzz 2 (offset 6 lines).
Hunk #5 FAILED at 3416.
4 out of 5 hunks FAILED -- rejects in file drivers/media/v4l2-core/v4l2-ioctl.c Patch patches/0003-media-v4l2-ioctl.c-fix-incorrect-error-path.patch can be reverse-applied

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Sat, 1 Oct 2022 07:12:45 +0200:

The pull request you sent on Sat, 1 Oct 2022 07:12:45 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.0-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/89f2ddce78cc2a397065de8df509364d37c058da

Thank you!

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