Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 163 insertions, 34 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 4fdfa2ae5418..43265207d463 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -44,7 +44,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
@@ -54,6 +53,7 @@
 #include <linux/miscdevice.h>
 #include <linux/ethtool.h>
 #include <linux/rtnetlink.h>
+#include <linux/compat.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
@@ -61,6 +61,7 @@
 #include <linux/crc32.h>
 #include <linux/nsproxy.h>
 #include <linux/virtio_net.h>
+#include <linux/rcupdate.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include <net/rtnetlink.h>
@@ -144,6 +145,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file)
         err = 0;
         tfile->tun = tun;
         tun->tfile = tfile;
+        tun->socket.file = file;
         dev_hold(tun->dev);
         sock_hold(tun->socket.sk);
         atomic_inc(&tfile->count);
@@ -158,6 +160,7 @@ static void __tun_detach(struct tun_struct *tun)
         /* Detach from net device */
         netif_tx_lock_bh(tun->dev);
         tun->tfile = NULL;
+        tun->socket.file = NULL;
         netif_tx_unlock_bh(tun->dev);
 
         /* Drop read queue */
@@ -364,6 +367,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!check_filter(&tun->txflt, skb))
                 goto drop;
 
+        if (tun->socket.sk->sk_filter &&
+            sk_filter(tun->socket.sk, skb))
+                goto drop;
+
         if (skb_queue_len(&tun->socket.sk->sk_receive_queue) >= dev->tx_queue_len) {
                 if (!(tun->flags & TUN_ONE_QUEUE)) {
                         /* Normal queueing mode. */
@@ -380,6 +387,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
                 }
         }
 
+        /* Orphan the skb - required as we might hang on to it
+         * for indefinite time. */
+        skb_orphan(skb);
+
         /* Enqueue packet */
         skb_queue_tail(&tun->socket.sk->sk_receive_queue, skb);
         dev->trans_start = jiffies;
@@ -387,7 +398,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Notify and wake up reader process */
         if (tun->flags & TUN_FASYNC)
                 kill_fasync(&tun->fasync, SIGIO, POLL_IN);
-        wake_up_interruptible(&tun->socket.wait);
+        wake_up_interruptible_poll(&tun->socket.wait, POLLIN |
+                                   POLLRDNORM | POLLRDBAND);
         return NETDEV_TX_OK;
 
 drop:
@@ -743,7 +755,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
         len = min_t(int, skb->len, len);
 
         skb_copy_datagram_const_iovec(skb, 0, iv, total, len);
-        total += len;
+        total += skb->len;
 
         tun->dev->stats.tx_packets++;
         tun->dev->stats.tx_bytes += len;
@@ -751,34 +763,23 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
         return total;
 }
 
-static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
-                            unsigned long count, loff_t pos)
+static ssize_t tun_do_read(struct tun_struct *tun,
+                           struct kiocb *iocb, const struct iovec *iv,
+                           ssize_t len, int noblock)
 {
-        struct file *file = iocb->ki_filp;
-        struct tun_file *tfile = file->private_data;
-        struct tun_struct *tun = __tun_get(tfile);
         DECLARE_WAITQUEUE(wait, current);
         struct sk_buff *skb;
-        ssize_t len, ret = 0;
-
-        if (!tun)
-                return -EBADFD;
+        ssize_t ret = 0;
 
         DBG(KERN_INFO "%s: tun_chr_read\n", tun->dev->name);
 
-        len = iov_length(iv, count);
-        if (len < 0) {
-                ret = -EINVAL;
-                goto out;
-        }
-
         add_wait_queue(&tun->socket.wait, &wait);
         while (len) {
                 current->state = TASK_INTERRUPTIBLE;
 
                 /* Read frames from the queue */
                 if (!(skb=skb_dequeue(&tun->socket.sk->sk_receive_queue))) {
-                        if (file->f_flags & O_NONBLOCK) {
+                        if (noblock) {
                                 ret = -EAGAIN;
                                 break;
                         }
@@ -805,6 +806,27 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
         current->state = TASK_RUNNING;
         remove_wait_queue(&tun->socket.wait, &wait);
 
+        return ret;
+}
+
+static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
+                            unsigned long count, loff_t pos)
+{
+        struct file *file = iocb->ki_filp;
+        struct tun_file *tfile = file->private_data;
+        struct tun_struct *tun = __tun_get(tfile);
+        ssize_t len, ret;
+
+        if (!tun)
+                return -EBADFD;
+        len = iov_length(iv, count);
+        if (len < 0) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = tun_do_read(tun, iocb, iv, len, file->f_flags & O_NONBLOCK);
+        ret = min_t(ssize_t, ret, len);
 out:
         tun_put(tun);
         return ret;
@@ -847,17 +869,49 @@ static void tun_sock_write_space(struct sock *sk)
                 return;
 
         if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
-                wake_up_interruptible_sync(sk->sk_sleep);
+                wake_up_interruptible_sync_poll(sk->sk_sleep, POLLOUT |
+                                                POLLWRNORM | POLLWRBAND);
 
-        tun = container_of(sk, struct tun_sock, sk)->tun;
+        tun = tun_sk(sk)->tun;
         kill_fasync(&tun->fasync, SIGIO, POLL_OUT);
 }
 
 static void tun_sock_destruct(struct sock *sk)
 {
-        free_netdev(container_of(sk, struct tun_sock, sk)->tun->dev);
+        free_netdev(tun_sk(sk)->tun->dev);
+}
+
+static int tun_sendmsg(struct kiocb *iocb, struct socket *sock,
+                       struct msghdr *m, size_t total_len)
+{
+        struct tun_struct *tun = container_of(sock, struct tun_struct, socket);
+        return tun_get_user(tun, m->msg_iov, total_len,
+                            m->msg_flags & MSG_DONTWAIT);
+}
+
+static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
+                       struct msghdr *m, size_t total_len,
+                       int flags)
+{
+        struct tun_struct *tun = container_of(sock, struct tun_struct, socket);
+        int ret;
+        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
+                return -EINVAL;
+        ret = tun_do_read(tun, iocb, m->msg_iov, total_len,
+                          flags & MSG_DONTWAIT);
+        if (ret > total_len) {
+                m->msg_flags |= MSG_TRUNC;
+                ret = flags & MSG_TRUNC ? ret : total_len;
+        }
+        return ret;
 }
 
+/* Ops structure to mimic raw sockets with tun */
+static const struct proto_ops tun_socket_ops = {
+        .sendmsg = tun_sendmsg,
+        .recvmsg = tun_recvmsg,
+};
+
 static struct proto tun_proto = {
         .name           = "tun",
         .owner          = THIS_MODULE,
@@ -986,11 +1040,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                         goto err_free_dev;
 
                 init_waitqueue_head(&tun->socket.wait);
+                tun->socket.ops = &tun_socket_ops;
                 sock_init_data(&tun->socket, sk);
                 sk->sk_write_space = tun_sock_write_space;
                 sk->sk_sndbuf = INT_MAX;
 
-                container_of(sk, struct tun_sock, sk)->tun = tun;
+                tun_sk(sk)->tun = tun;
 
                 security_tun_dev_post_create(sk);
 
@@ -1110,18 +1165,19 @@ static int set_offload(struct net_device *dev, unsigned long arg)
         return 0;
 }
 
-static long tun_chr_ioctl(struct file *file, unsigned int cmd,
-                          unsigned long arg)
+static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long arg, int ifreq_len)
 {
         struct tun_file *tfile = file->private_data;
         struct tun_struct *tun;
         void __user* argp = (void __user*)arg;
+        struct sock_fprog fprog;
         struct ifreq ifr;
         int sndbuf;
         int ret;
 
         if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
-                if (copy_from_user(&ifr, argp, sizeof ifr))
+                if (copy_from_user(&ifr, argp, ifreq_len))
                         return -EFAULT;
 
         if (cmd == TUNGETFEATURES) {
@@ -1144,7 +1200,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,
                 if (ret)
                         goto unlock;
 
-                if (copy_to_user(argp, &ifr, sizeof(ifr)))
+                if (copy_to_user(argp, &ifr, ifreq_len))
                         ret = -EFAULT;
                 goto unlock;
         }
@@ -1162,7 +1218,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,
                 if (ret)
                         break;
 
-                if (copy_to_user(argp, &ifr, sizeof(ifr)))
+                if (copy_to_user(argp, &ifr, ifreq_len))
                         ret = -EFAULT;
                 break;
 
@@ -1236,7 +1292,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,
                 /* Get hw addres */
                 memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN);
                 ifr.ifr_hwaddr.sa_family = tun->dev->type;
-                if (copy_to_user(argp, &ifr, sizeof ifr))
+                if (copy_to_user(argp, &ifr, ifreq_len))
                         ret = -EFAULT;
                 break;
 
@@ -1263,6 +1319,26 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,
                 tun->socket.sk->sk_sndbuf = sndbuf;
                 break;
 
+        case TUNATTACHFILTER:
+                /* Can be set only for TAPs */
+                ret = -EINVAL;
+                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                        break;
+                ret = -EFAULT;
+                if (copy_from_user(&fprog, argp, sizeof(fprog)))
+                        break;
+
+                ret = sk_attach_filter(&fprog, tun->socket.sk);
+                break;
+
+        case TUNDETACHFILTER:
+                /* Can be set only for TAPs */
+                ret = -EINVAL;
+                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                        break;
+                ret = sk_detach_filter(tun->socket.sk);
+                break;
+
         default:
                 ret = -EINVAL;
                 break;
@@ -1275,6 +1351,41 @@ unlock:
         return ret;
 }
 
+static long tun_chr_ioctl(struct file *file,
+                          unsigned int cmd, unsigned long arg)
+{
+        return __tun_chr_ioctl(file, cmd, arg, sizeof (struct ifreq));
+}
+
+#ifdef CONFIG_COMPAT
+static long tun_chr_compat_ioctl(struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        switch (cmd) {
+        case TUNSETIFF:
+        case TUNGETIFF:
+        case TUNSETTXFILTER:
+        case TUNGETSNDBUF:
+        case TUNSETSNDBUF:
+        case SIOCGIFHWADDR:
+        case SIOCSIFHWADDR:
+                arg = (unsigned long)compat_ptr(arg);
+                break;
+        default:
+                arg = (compat_ulong_t)arg;
+                break;
+        }
+
+        /*
+         * compat_ifreq is shorter than ifreq, so we must not access beyond
+         * the end of that structure. All fields that are used in this
+         * driver are compatible though, we don't need to convert the
+         * contents.
+         */
+        return __tun_chr_ioctl(file, cmd, arg, sizeof(struct compat_ifreq));
+}
+#endif /* CONFIG_COMPAT */
+
 static int tun_chr_fasync(int fd, struct file *file, int on)
 {
         struct tun_struct *tun = tun_get(file);
@@ -1285,7 +1396,6 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 
         DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);
 
-        lock_kernel();
         if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
                 goto out;
 
@@ -1298,7 +1408,6 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
                 tun->flags &= ~TUN_FASYNC;
         ret = 0;
 out:
-        unlock_kernel();
         tun_put(tun);
         return ret;
 }
@@ -1306,7 +1415,7 @@ out:
 static int tun_chr_open(struct inode *inode, struct file * file)
 {
         struct tun_file *tfile;
-        cycle_kernel_lock();
+
         DBG1(KERN_INFO "tunX: tun_chr_open\n");
 
         tfile = kmalloc(sizeof(*tfile), GFP_KERNEL);
@@ -1332,7 +1441,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
 
                 __tun_detach(tun);
 
-                /* If desireable, unregister the netdevice. */
+                /* If desirable, unregister the netdevice. */
                 if (!(tun->flags & TUN_PERSIST)) {
                         rtnl_lock();
                         if (dev->reg_state == NETREG_REGISTERED)
@@ -1359,7 +1468,10 @@ static const struct file_operations tun_fops = {
         .write = do_sync_write,
         .aio_write = tun_chr_aio_write,
         .poll   = tun_chr_poll,
-        .unlocked_ioctl = tun_chr_ioctl,
+        .unlocked_ioctl = tun_chr_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = tun_chr_compat_ioctl,
+#endif
         .open   = tun_chr_open,
         .release = tun_chr_close,
         .fasync = tun_chr_fasync
@@ -1489,6 +1601,23 @@ static void tun_cleanup(void)
         rtnl_link_unregister(&tun_link_ops);
 }
 
+/* Get an underlying socket object from tun file.  Returns error unless file is
+ * attached to a device.  The returned object works like a packet socket, it
+ * can be used for sock_sendmsg/sock_recvmsg.  The caller is responsible for
+ * holding a reference to the file for as long as the socket is in use. */
+struct socket *tun_get_socket(struct file *file)
+{
+        struct tun_struct *tun;
+        if (file->f_op != &tun_fops)
+                return ERR_PTR(-EINVAL);
+        tun = tun_get(file);
+        if (!tun)
+                return ERR_PTR(-EBADFD);
+        tun_put(tun);
+        return &tun->socket;
+}
+EXPORT_SYMBOL_GPL(tun_get_socket);
+
 module_init(tun_init);
 module_exit(tun_cleanup);
 MODULE_DESCRIPTION(DRV_DESCRIPTION);