[kernel] r14363 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Oct  9 03:27:05 2009
New Revision: 14363

Log:
v4l2: Improve 32/64-bit ioctl translation (Closes: #508649)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-add-some-missing-compat32-ioctls.patch
   dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-compat-test-for-unlocked_ioctl.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/20

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Fri Oct  9 03:00:47 2009	(r14362)
+++ dists/lenny/linux-2.6/debian/changelog	Fri Oct  9 03:27:05 2009	(r14363)
@@ -15,6 +15,7 @@
     (Closes: #549002)
   * sis190: Correct DMA sync handling on small packets (Closes: #541169)
   * mmc: Increase power-up delay (Closes: #508599)
+  * v4l2: Improve 32/64-bit ioctl translation (Closes: #508649)
 
   [ dann frazier ]
   * autofs4: don't make expiring dentry negative, avoiding an oops

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-add-some-missing-compat32-ioctls.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-add-some-missing-compat32-ioctls.patch	Fri Oct  9 03:27:05 2009	(r14363)
@@ -0,0 +1,30 @@
+Backported to 2.6.26 from:
+
+From: Gregor Jasny <jasny at vidsoft.de>
+Date: Thu, 23 Oct 2008 09:55:22 -0300
+Subject: [PATCH] V4L/DVB (9352): Add some missing compat32 ioctls
+
+This patch adds the missing compat ioctls that are needed to
+operate Skype in combination with libv4l and a MJPEG only camera.
+
+If you think it's trivial enough please submit it to -stable, too.
+---
+--- a/drivers/media/video/compat_ioctl32.c
++++ b/drivers/media/video/compat_ioctl32.c
+@@ -867,6 +867,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
+ 	case VIDIOC_STREAMON32:
+ 	case VIDIOC_STREAMOFF32:
+ 	case VIDIOC_G_PARM:
++	case VIDIOC_S_PARM:
+ 	case VIDIOC_G_STD:
+ 	case VIDIOC_S_STD:
+ 	case VIDIOC_G_TUNER:
+@@ -885,6 +886,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
+ 	case VIDIOC_QUERYCTRL:
+ 	case VIDIOC_S_INPUT32:
+ 	case VIDIOC_TRY_FMT32:
++	case VIDIOC_ENUM_FRAMESIZES:
++	case VIDIOC_ENUM_FRAMEINTERVALS:
+ 		ret = do_video_ioctl(file, cmd, arg);
+ 		break;
+ 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-compat-test-for-unlocked_ioctl.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/v4l2-compat-test-for-unlocked_ioctl.patch	Fri Oct  9 03:27:05 2009	(r14363)
@@ -0,0 +1,31 @@
+From 3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hverkuil at xs4all.nl>
+Date: Tue, 16 Dec 2008 08:32:37 -0300
+Subject: [PATCH] V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
+
+The v4l_compat_ioctl32() function only tested for the presence of the
+ioctl op, not for unlocked_ioctl. So it would always return an error
+when used with drivers that use unlocked_ioctl instead of ioctl.
+
+Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+---
+ drivers/media/video/compat_ioctl32.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
+index e6ca401..0ea85a0 100644
+--- a/drivers/media/video/compat_ioctl32.c
++++ b/drivers/media/video/compat_ioctl32.c
+@@ -831,7 +831,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
+ {
+ 	int ret = -ENOIOCTLCMD;
+ 
+-	if (!file->f_op->ioctl)
++	if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
+ 		return ret;
+ 
+ 	switch (cmd) {
+-- 
+1.6.4.3
+

Modified: dists/lenny/linux-2.6/debian/patches/series/20
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/20	Fri Oct  9 03:00:47 2009	(r14362)
+++ dists/lenny/linux-2.6/debian/patches/series/20	Fri Oct  9 03:27:05 2009	(r14363)
@@ -7,4 +7,6 @@
 + bugfix/all/fs-nfs-avoid-overrun-copying-client-ip.patch
 + bugfix/all/sis190-correct-dma-sync-small-packets.patch
 + bugfix/all/mmc-increase-power-up-delay.patch
++ bugfix/all/v4l2-add-some-missing-compat32-ioctls.patch
++ bugfix/all/v4l2-compat-test-for-unlocked_ioctl.patch
 + features/all/ftdi_sio-openrd.patch