rpms/kernel/devel linux-2.6-cmtp-compat.patch, NONE, 1.1 linux-2.6-hidp-compat.patch, NONE, 1.1 kernel-2.6.spec, 1.2667, 1.2668

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22933

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-cmtp-compat.patch linux-2.6-hidp-compat.patch 
Log Message:
more bluetooth ioctl fixing

linux-2.6-cmtp-compat.patch:
 sock.c |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+)

--- NEW FILE linux-2.6-cmtp-compat.patch ---
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 10ad7fd..68e1290 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -34,6 +34,7 @@ #include <linux/skbuff.h>
 #include <linux/socket.h>
 #include <linux/ioctl.h>
 #include <linux/file.h>
+#include <linux/compat.h>
 #include <net/sock.h>
 
 #include <linux/isdn/capilli.h>
@@ -137,11 +138,44 @@ static int cmtp_sock_ioctl(struct socket
 	return -EINVAL;
 }
 
+#ifdef CONFIG_COMPAT
+static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+
+	if (cmd == CMTPGETCONNLIST) {
+		struct cmtp_connlist_req cl;
+		uint32_t uci;
+		int err;
+
+		if (get_user(cl.cnum, (uint32_t __user *)arg) ||
+		    get_user(uci, (u32 __user *)(arg+4)))
+			return -EFAULT;
+
+		cl.ci = compat_ptr(uci);
+
+		if (cl.cnum <= 0)
+			return -EINVAL;
+	
+		err = cmtp_get_connlist(&cl);
+
+		if (!err && put_user(cl.cnum, (uint32_t __user *)arg))
+			err = -EFAULT;
+
+		return err;
+	}
+
+	return cmtp_sock_ioctl(sock, cmd, arg);
+}
+#endif
+
 static const struct proto_ops cmtp_sock_ops = {
 	.family		= PF_BLUETOOTH,
 	.owner		= THIS_MODULE,
 	.release	= cmtp_sock_release,
 	.ioctl		= cmtp_sock_ioctl,
+#ifdef CONFIG_COMPAT
+	.compat_ioctl	= cmtp_sock_compat_ioctl,
+#endif
 	.bind		= sock_no_bind,
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,

linux-2.6-hidp-compat.patch:
 sock.c |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+)

--- NEW FILE linux-2.6-hidp-compat.patch ---
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 099646e..e01fdc5 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -35,6 +35,7 @@ #include <linux/socket.h>
 #include <linux/ioctl.h>
 #include <linux/file.h>
 #include <linux/init.h>
+#include <linux/compat.h>
 #include <net/sock.h>
 
 #include "hidp.h"
@@ -143,11 +144,87 @@ static int hidp_sock_ioctl(struct socket
 	return -EINVAL;
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_hidp_connadd_req {
+	int   ctrl_sock;	// Connected control socket
+	int   intr_sock;	// Connteted interrupt socket
+	__u16 parser;
+	__u16 rd_size;
+	compat_uptr_t rd_data;
+	__u8  country;
+	__u8  subclass;
+	__u16 vendor;
+	__u16 product;
+	__u16 version;
+	__u32 flags;
+	__u32 idle_to;
+	char  name[128];
+};
+
+static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+	if (cmd == HIDPGETCONNLIST) {
+		struct hidp_connlist_req cl;
+		uint32_t uci;
+		int err;
+
+		if (get_user(cl.cnum, (uint32_t __user *)arg) ||
+		    get_user(uci, (u32 __user *)(arg+4)))
+			return -EFAULT;
+
+		cl.ci = compat_ptr(uci);
+
+		if (cl.cnum <= 0)
+			return -EINVAL;
+
+		err = hidp_get_connlist(&cl);
+
+		if (!err && put_user(cl.cnum, (uint32_t __user *)arg))
+			err = -EFAULT;
+
+		return err;
+	} else if (cmd == HIDPCONNADD) {
+		struct compat_hidp_connadd_req ca;
+		struct hidp_connadd_req __user *uca;
+
+		uca = compat_alloc_user_space(sizeof(*uca));
+
+		if (copy_from_user(&ca, (void *)arg, sizeof(ca)))
+			return -EFAULT;
+
+		if (put_user(ca.ctrl_sock, &uca->ctrl_sock)
+		    || put_user(ca.intr_sock, &uca->intr_sock)
+		    || put_user(ca.parser, &uca->parser)
+		    || put_user(ca.rd_size, &uca->parser)
+		    || put_user(compat_ptr(ca.rd_data), &uca->rd_data)
+		    || put_user(ca.country, &uca->country)
+		    || put_user(ca.subclass, &uca->subclass)
+		    || put_user(ca.vendor, &uca->vendor)
+		    || put_user(ca.product, &uca->product)
+		    || put_user(ca.version, &uca->version)
+		    || put_user(ca.flags, &uca->flags)
+		    || put_user(ca.idle_to, &uca->idle_to)
+		    || copy_to_user(&uca->name[0], &ca.name[0], 128))
+			return -EFAULT;
+		
+		arg = (unsigned long)uca;
+		/* Fall through. We don't actually write back any _changes_
+		   to the structure anyway, so there's no need to copy back
+		   into the original compat version */
+	}
+
+	return hidp_sock_ioctl(sock, cmd, arg);
+}
+#endif
+
 static const struct proto_ops hidp_sock_ops = {
 	.family		= PF_BLUETOOTH,
 	.owner		= THIS_MODULE,
 	.release	= hidp_sock_release,
 	.ioctl		= hidp_sock_ioctl,
+#ifdef CONFIG_COMPAT
+	.compat_ioctl	= hidp_sock_compat_ioctl,
+#endif
 	.bind		= sock_no_bind,
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2667
retrieving revision 1.2668
diff -u -r1.2667 -r1.2668
--- kernel-2.6.spec	18 Sep 2006 10:10:53 -0000	1.2667
+++ kernel-2.6.spec	18 Sep 2006 14:31:05 -0000	1.2668
@@ -471,6 +471,8 @@
 Patch1793: linux-2.6-asix-usbnet-update.patch
 Patch1794: linux-2.6-olpc-touchpad.diff
 Patch1795: linux-2.6-bnep-compat.patch
+Patch1796: linux-2.6-hidp-compat.patch
+Patch1797: linux-2.6-cmtp-compat.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -1045,8 +1047,11 @@
 # OLPC touchpad
 %patch1794 -p1
 %endif
-# Fix BNEPGETCONNLIST compat ioctl to refrain from scribbling on random memory
+# Fix various Bluetooth compat ioctls
 %patch1795 -p1
+%patch1796 -p1
+%patch1797 -p1
+
 
 # Fixes for DUB-E100 vB1 usb ethernet
 %patch1793 -p1
@@ -1888,7 +1893,7 @@
 
 %changelog
 * Mon Sep 18 2006 David Woodhouse <dwmw2 at redhat.com>
-- Fix BNEPGETCONNLIST compat ioctl 
+- Fix various Bluetooth compat ioctls
 
 * Sun Sep 17 2006 Juan Quintela <quintela at redhat.com>
 - xen update: