netfiltr: ipt_CLUSTERIP: simplify seq_file codeA

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

diff --git a/net/atm/resources.c b/net/atm/resources.c
index 529f7e6..56b7322 100644 (file)
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -142,8 +142,8 @@ void atm_dev_deregister(struct atm_dev *dev)
        set_bit(ATM_DF_REMOVED, &dev->flags);
 
        /*
-        * if we remove current device from atm_devs list, new device 
-        * with same number can appear, such we need deregister proc, 
+        * if we remove current device from atm_devs list, new device
+        * with same number can appear, such we need deregister proc,
         * release async all vccs and remove them from vccs list too
         */
        mutex_lock(&atm_dev_mutex);
@@ -195,20 +195,39 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, in
 }
 
 
-int atm_dev_ioctl(unsigned int cmd, void __user *arg)
+int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
 {
        void __user *buf;
        int error, len, number, size = 0;
        struct atm_dev *dev;
        struct list_head *p;
        int *tmp_buf, *tmp_p;
-       struct atm_iobuf __user *iobuf = arg;
-       struct atmif_sioc __user *sioc = arg;
+       int __user *sioc_len;
+       int __user *iobuf_len;
+
+#ifndef CONFIG_COMPAT
+       compat = 0; /* Just so the compiler _knows_ */
+#endif
+
        switch (cmd) {
                case ATM_GETNAMES:
-                       if (get_user(buf, &iobuf->buffer))
-                               return -EFAULT;
-                       if (get_user(len, &iobuf->length))
+
+                       if (compat) {
+#ifdef CONFIG_COMPAT
+                               struct compat_atm_iobuf __user *ciobuf = arg;
+                               compat_uptr_t cbuf;
+                               iobuf_len = &ciobuf->length;
+                               if (get_user(cbuf, &ciobuf->buffer))
+                                       return -EFAULT;
+                               buf = compat_ptr(cbuf);
+#endif
+                       } else {
+                               struct atm_iobuf __user *iobuf = arg;
+                               iobuf_len = &iobuf->length;
+                               if (get_user(buf, &iobuf->buffer))
+                                       return -EFAULT;
+                       }
+                       if (get_user(len, iobuf_len))
                                return -EFAULT;
                        mutex_lock(&atm_dev_mutex);
                        list_for_each(p, &atm_devs)
@@ -228,8 +247,8 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                *tmp_p++ = dev->number;
                        }
                        mutex_unlock(&atm_dev_mutex);
-                       error = ((copy_to_user(buf, tmp_buf, size)) ||
-                                       put_user(size, &iobuf->length))
+                       error = ((copy_to_user(buf, tmp_buf, size)) ||
+                                       put_user(size, iobuf_len))
                                                ? -EFAULT : 0;
                        kfree(tmp_buf);
                        return error;
@@ -237,17 +256,36 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                        break;
        }
 
-       if (get_user(buf, &sioc->arg))
-               return -EFAULT;
-       if (get_user(len, &sioc->length))
-               return -EFAULT;
-       if (get_user(number, &sioc->number))
-               return -EFAULT;
-
+       if (compat) {
+#ifdef CONFIG_COMPAT
+               struct compat_atmif_sioc __user *csioc = arg;
+               compat_uptr_t carg;
+
+               sioc_len = &csioc->length;
+               if (get_user(carg, &csioc->arg))
+                       return -EFAULT;
+               buf = compat_ptr(carg);
+
+               if (get_user(len, &csioc->length))
+                       return -EFAULT;
+               if (get_user(number, &csioc->number))
+                       return -EFAULT;
+#endif
+       } else {
+               struct atmif_sioc __user *sioc = arg;
+
+               sioc_len = &sioc->length;
+               if (get_user(buf, &sioc->arg))
+                       return -EFAULT;
+               if (get_user(len, &sioc->length))
+                       return -EFAULT;
+               if (get_user(number, &sioc->number))
+                       return -EFAULT;
+       }
        if (!(dev = try_then_request_module(atm_dev_lookup(number),
                                            "atm-device-%d", number)))
                return -ENODEV;
-       
+
        switch (cmd) {
                case ATM_GETTYPE:
                        size = strlen(dev->type) + 1;
@@ -358,7 +396,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                        size = error;
                        /* may return 0, but later on size == 0 means "don't
                           write the length" */
-                       error = put_user(size, &sioc->length)
+                       error = put_user(size, sioc_len)
                                ? -EFAULT : 0;
                        goto done;
                case ATM_SETLOOP:
@@ -380,19 +418,29 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                        }
                        /* fall through */
                default:
-                       if (!dev->ops->ioctl) {
-                               error = -EINVAL;
-                               goto done;
+                       if (compat) {
+#ifdef CONFIG_COMPAT
+                               if (!dev->ops->compat_ioctl) {
+                                       error = -EINVAL;
+                                       goto done;
+                               }
+                               size = dev->ops->compat_ioctl(dev, cmd, buf);
+#endif
+                       } else {
+                               if (!dev->ops->ioctl) {
+                                       error = -EINVAL;
+                                       goto done;
+                               }
+                               size = dev->ops->ioctl(dev, cmd, buf);
                        }
-                       size = dev->ops->ioctl(dev, cmd, buf);
                        if (size < 0) {
                                error = (size == -ENOIOCTLCMD ? -EINVAL : size);
                                goto done;
                        }
        }
-       
+
        if (size)
-               error = put_user(size, &sioc->length)
+               error = put_user(size, sioc_len)
                        ? -EFAULT : 0;
        else
                error = 0;
@@ -414,19 +462,20 @@ static __inline__ void *dev_get_idx(loff_t left)
 
 void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       mutex_lock(&atm_dev_mutex);
-       return *pos ? dev_get_idx(*pos) : (void *) 1;
+       mutex_lock(&atm_dev_mutex);
+       return *pos ? dev_get_idx(*pos) : SEQ_START_TOKEN;
 }
 
 void atm_dev_seq_stop(struct seq_file *seq, void *v)
 {
-       mutex_unlock(&atm_dev_mutex);
+       mutex_unlock(&atm_dev_mutex);
 }
- 
+
 void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        ++*pos;
-       v = (v == (void *)1) ? atm_devs.next : ((struct list_head *)v)->next;
+       v = (v == SEQ_START_TOKEN)
+               ? atm_devs.next : ((struct list_head *)v)->next;
        return (v == &atm_devs) ? NULL : v;
 }