Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / net / atm / ioctl.c

diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 851cfa6..4da8892 100644 (file)
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -4,7 +4,6 @@
 /* 2003 John Levon  <levon@movementarian.org> */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/net.h>         /* struct socket, struct proto_ops */
@@ -20,6 +19,7 @@
 #include <linux/atmlec.h>
 #include <linux/mutex.h>
 #include <asm/ioctls.h>
+#include <net/compat.h>
 
 #include "resources.h"
 #include "signaling.h"         /* for WAITING and sigd_attach */
@@ -47,7 +47,7 @@ void deregister_atm_ioctl(struct atm_ioctl *ioctl)
 EXPORT_SYMBOL(register_atm_ioctl);
 EXPORT_SYMBOL(deregister_atm_ioctl);
 
-int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg, int compat)
 {
        struct sock *sk = sock->sk;
        struct atm_vcc *vcc;
@@ -63,8 +63,7 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                                error =  -EINVAL;
                                goto done;
                        }
-                       error = put_user(sk->sk_sndbuf -
-                                        atomic_read(&sk->sk_wmem_alloc),
+                       error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),
                                         (int __user *) argp) ? -EFAULT : 0;
                        goto done;
                case SIOCINQ:
@@ -77,14 +76,29 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                                }
                                skb = skb_peek(&sk->sk_receive_queue);
                                error = put_user(skb ? skb->len : 0,
-                                                (int __user *)argp) ? -EFAULT : 0;
+                                                (int __user *)argp) ? -EFAULT : 0;
                                goto done;
                        }
                case SIOCGSTAMP: /* borrowed from IP */
-                       error = sock_get_timestamp(sk, argp);
+#ifdef CONFIG_COMPAT
+                       if (compat)
+                               error = compat_sock_get_timestamp(sk, argp);
+                       else
+#endif
+                               error = sock_get_timestamp(sk, argp);
+                       goto done;
+               case SIOCGSTAMPNS: /* borrowed from IP */
+#ifdef CONFIG_COMPAT
+                       if (compat)
+                               error = compat_sock_get_timestampns(sk, argp);
+                       else
+#endif
+                               error = sock_get_timestampns(sk, argp);
                        goto done;
                case ATM_SETSC:
-                       printk(KERN_WARNING "ATM_SETSC is obsolete\n");
+                       if (net_ratelimit())
+                               printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n",
+                                      current->comm, task_pid_nr(current));
                        error = 0;
                        goto done;
                case ATMSIGD_CTRL:
@@ -97,12 +111,23 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         * info uses kernel pointers as opaque references,
                         * so the holder of the file descriptor can scribble
                         * on the kernel... so we should make sure that we
-                        * have the same privledges that /proc/kcore needs
+                        * have the same privileges that /proc/kcore needs
                         */
                        if (!capable(CAP_SYS_RAWIO)) {
                                error = -EPERM;
                                goto done;
                        }
+#ifdef CONFIG_COMPAT
+                       /* WTF? I don't even want to _think_ about making this
+                          work for 32-bit userspace. TBH I don't really want
+                          to think about it at all. dwmw2. */
+                       if (compat) {
+                               if (net_ratelimit())
+                                       printk(KERN_WARNING "32-bit task cannot be atmsigd\n");
+                               error = -EINVAL;
+                               goto done;
+                       }
+#endif
                        error = sigd_attach(vcc);
                        if (!error)
                                sock->state = SS_CONNECTED;
@@ -153,8 +178,21 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        if (error != -ENOIOCTLCMD)
                goto done;
 
-       error = atm_dev_ioctl(cmd, argp);
+       error = atm_dev_ioctl(cmd, argp, compat);
 
 done:
        return error;
 }
+
+
+int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+       return do_vcc_ioctl(sock, cmd, arg, 0);
+}
+
+#ifdef CONFIG_COMPAT
+int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+       return do_vcc_ioctl(sock, cmd, arg, 1);
+}
+#endif