Skip to contentSkip to conversation

media fixes

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

For a bunch of patches addressing issues at the vivid driver and adding new checks at V4L2 to validate the input parameters from some ioctls.

Regards,
Mauro

The following changes since commit 247f34f7b80357943234f93f247a1ae6b6c3a740:

Linux 6.1-rc2 (2022-10-23 15:27:33 -0700)

are available in the Git repository at:

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

for you to fetch changes up to de547896aac606a00435a219757a940ece142bf0:

media: vivid.rst: loop_video is set on the capture devnode (2022-10-25 16:43:54 +0100)

----------------------------------------------------------------
media fixes for v6.1-rc3

----------------------------------------------------------------
Hans Verkuil (8):
media: vivid: s_fbuf: add more sanity checks
media: vivid: dev->bitmap_cap wasn't freed in all cases
media: v4l2-dv-timings: add sanity checks for blanking values
media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced'
media: vivid: fix control handler mutex deadlock
media: vivid: drop GFP_DMA32
media: vivid: set num_in/outputs to 0 if not supported
media: vivid.rst: loop_video is set on the capture devnode

 Documentation/admin-guide/media/vivid.rst        |  2 +-
 drivers/media/test-drivers/vivid/vivid-core.c    | 38 +++++++++++++++++++++---
 drivers/media/test-drivers/vivid/vivid-core.h    |  2 ++
 drivers/media/test-drivers/vivid/vivid-osd.c     |  2 +-
 drivers/media/test-drivers/vivid/vivid-vid-cap.c | 35 ++++++++++++++++++----
 drivers/media/v4l2-core/v4l2-dv-timings.c        | 14 +++++++++
 include/uapi/linux/videodev2.h                   |  3 +-
 7 files changed, 83 insertions(+), 13 deletions(-)
#1 lore raw

Re: [GIT PULL for v6.1-rc3] media fixes (#86978)

From: [email protected]

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

gpg: Signature made Thu 27 Oct 2022 09:05:51 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/0001-media-vivid-s_fbuf-add-more-sanity-checks.patch doesn't apply:
Applying patch patches/0001-media-vivid-s_fbuf-add-more-sanity-checks.patch patching file drivers/media/test-drivers/vivid/vivid-core.c
Hunk #1 succeeded at 361 with fuzz 1 (offset 22 lines).
patching file drivers/media/test-drivers/vivid/vivid-core.h
Hunk #1 succeeded at 615 with fuzz 2 (offset 2 lines).
patching file drivers/media/test-drivers/vivid/vivid-vid-cap.c
Hunk #1 FAILED at 1276.
1 out of 1 hunk FAILED -- rejects in file drivers/media/test-drivers/vivid/vivid-vid-cap.c Patch patches/0001-media-vivid-s_fbuf-add-more-sanity-checks.patch can be reverse-applied

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Thu, 27 Oct 2022 18:17:14 +0100:

The pull request you sent on Thu, 27 Oct 2022 18:17:14 +0100:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7f9a7cd690c7d59cde03027aee9bebd83b4a9dc6

Thank you!

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