[PATCH v2 0/7] media: v4l2: compat ioctl fixes

Arnd Bergmann posted 7 patches 1 week, 3 days ago
Failed in applying to current master (apply log)
drivers/media/i2c/adv7842.c                   |    3 +
drivers/media/i2c/saa6588.c                   |    4 +-
drivers/media/pci/bt8xx/bttv-driver.c         |    6 +-
drivers/media/pci/saa7134/saa7134-video.c     |    6 +-
drivers/media/platform/davinci/vpbe_display.c |    2 +-
drivers/media/platform/davinci/vpbe_venc.c    |    6 +-
drivers/media/radio/si4713/si4713.c           |    3 +
drivers/media/v4l2-core/v4l2-compat-ioctl32.c |    3 +
drivers/media/v4l2-core/v4l2-ioctl.c          |   57 +-
drivers/media/v4l2-core/v4l2-subdev.c         |   43 +-
drivers/staging/media/atomisp/Makefile        |    1 -
drivers/staging/media/atomisp/TODO            |    5 +
.../atomisp/pci/atomisp_compat_ioctl32.c      | 1202 -----------------
.../staging/media/atomisp/pci/atomisp_fops.c  |    8 +-
include/media/v4l2-subdev.h                   |    7 +-
15 files changed, 81 insertions(+), 1275 deletions(-)
delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c

[PATCH v2 0/7] media: v4l2: compat ioctl fixes

Posted by Arnd Bergmann 1 week, 3 days ago
From: Arnd Bergmann <arnd@arndb.de>

There was a report from Syzbot a while ago that I tried fixed earlier,
but my fix did not get picked up because of a merge conflict with
another patch I had in my tree.

I finally managed to take a close enough look at the merge conflict
to figure out that the subdev driver handling for VIDIOC_DQEVENT_TIME32
was wrong in all combinations of the patches and just needs to be
removed. In the process I also came across a couple of other issues,
so the series has now grown to seven patches.

I have done randconfig build testing and found no compile time issues,
but the driver specific patches have not been tested so far.

        Arnd

Link: https://patchwork.linuxtv.org/project/linux-media/patch/20210318134334.2933141-1-arnd@kernel.org/

Arnd Bergmann (7):
  media: v4l2-core: ignore native time32 ioctls on 64-bit
  media: v4l2-core: explicitly clear ioctl input data
  media: subdev: remove VIDIOC_DQEVENT_TIME32 handling
  media: v4l2-core: return -ENODEV from ioctl when not registered
  media: atomisp: remove compat_ioctl32 code
  media: subdev: fix compat_ioctl32
  media: subdev: disallow ioctl for saa6588/davinci

 drivers/media/i2c/adv7842.c                   |    3 +
 drivers/media/i2c/saa6588.c                   |    4 +-
 drivers/media/pci/bt8xx/bttv-driver.c         |    6 +-
 drivers/media/pci/saa7134/saa7134-video.c     |    6 +-
 drivers/media/platform/davinci/vpbe_display.c |    2 +-
 drivers/media/platform/davinci/vpbe_venc.c    |    6 +-
 drivers/media/radio/si4713/si4713.c           |    3 +
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c |    3 +
 drivers/media/v4l2-core/v4l2-ioctl.c          |   57 +-
 drivers/media/v4l2-core/v4l2-subdev.c         |   43 +-
 drivers/staging/media/atomisp/Makefile        |    1 -
 drivers/staging/media/atomisp/TODO            |    5 +
 .../atomisp/pci/atomisp_compat_ioctl32.c      | 1202 -----------------
 .../staging/media/atomisp/pci/atomisp_fops.c  |    8 +-
 include/media/v4l2-subdev.h                   |    7 +-
 15 files changed, 81 insertions(+), 1275 deletions(-)
 delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c

-- 
2.29.2

Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: Liu Shixin <liushixin2@huawei.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: linux-staging@lists.linux.dev