1 files changed, 70 insertions, 23 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e470ae59d405..06a039414628 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -111,6 +111,7 @@ do {								\
 #define TUN_FASYNC      IFF_ATTACH_QUEUE
 /* High bits in flags field are unused. */
 #define TUN_VNET_LE     0x80000000
+#define TUN_VNET_BE     0x40000000
 
 #define TUN_FEATURES (IFF_NO_PI | IFF_ONE_QUEUE | IFF_VNET_HDR | \
                       IFF_MULTI_QUEUE)
@@ -146,7 +147,6 @@ struct tun_file {
         struct socket socket;
         struct socket_wq wq;
         struct tun_struct __rcu *tun;
-        struct net *net;
         struct fasync_struct *fasync;
         /* only used for fasnyc */
         unsigned int flags;
@@ -206,14 +206,68 @@ struct tun_struct {
         u32 flow_count;
 };
 
+#ifdef CONFIG_TUN_VNET_CROSS_LE
+static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
+{
+        return tun->flags & TUN_VNET_BE ? false :
+                virtio_legacy_is_little_endian();
+}
+
+static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
+{
+        int be = !!(tun->flags & TUN_VNET_BE);
+
+        if (put_user(be, argp))
+                return -EFAULT;
+
+        return 0;
+}
+
+static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp)
+{
+        int be;
+
+        if (get_user(be, argp))
+                return -EFAULT;
+
+        if (be)
+                tun->flags |= TUN_VNET_BE;
+        else
+                tun->flags &= ~TUN_VNET_BE;
+
+        return 0;
+}
+#else
+static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
+{
+        return virtio_legacy_is_little_endian();
+}
+
+static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
+{
+        return -EINVAL;
+}
+
+static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp)
+{
+        return -EINVAL;
+}
+#endif /* CONFIG_TUN_VNET_CROSS_LE */
+
+static inline bool tun_is_little_endian(struct tun_struct *tun)
+{
+        return tun->flags & TUN_VNET_LE ||
+                tun_legacy_is_little_endian(tun);
+}
+
 static inline u16 tun16_to_cpu(struct tun_struct *tun, __virtio16 val)
 {
-        return __virtio16_to_cpu(tun->flags & TUN_VNET_LE, val);
+        return __virtio16_to_cpu(tun_is_little_endian(tun), val);
 }
 
 static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val)
 {
-        return __cpu_to_virtio16(tun->flags & TUN_VNET_LE, val);
+        return __cpu_to_virtio16(tun_is_little_endian(tun), val);
 }
 
 static inline u32 tun_hashfn(u32 rxhash)
@@ -493,10 +547,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
                             tun->dev->reg_state == NETREG_REGISTERED)
                                 unregister_netdevice(tun->dev);
                 }
-
-                BUG_ON(!test_bit(SOCK_EXTERNALLY_ALLOCATED,
-                                 &tfile->socket.flags));
-                sk_release_kernel(&tfile->sk);
+                sock_put(&tfile->sk);
         }
 }
 
@@ -1492,18 +1543,10 @@ out:
         return ret;
 }
 
-static int tun_release(struct socket *sock)
-{
-        if (sock->sk)
-                sock_put(sock->sk);
-        return 0;
-}
-
 /* Ops structure to mimic raw sockets with tun */
 static const struct proto_ops tun_socket_ops = {
         .sendmsg = tun_sendmsg,
         .recvmsg = tun_recvmsg,
-        .release = tun_release,
 };
 
 static struct proto tun_proto = {
@@ -1865,7 +1908,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         if (cmd == TUNSETIFF && !tun) {
                 ifr.ifr_name[IFNAMSIZ-1] = '\0';
 
-                ret = tun_set_iff(tfile->net, file, &ifr);
+                ret = tun_set_iff(sock_net(&tfile->sk), file, &ifr);
 
                 if (ret)
                         goto unlock;
@@ -2056,6 +2099,14 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
                         tun->flags &= ~TUN_VNET_LE;
                 break;
 
+        case TUNGETVNETBE:
+                ret = tun_get_vnet_be(tun, argp);
+                break;
+
+        case TUNSETVNETBE:
+                ret = tun_set_vnet_be(tun, argp);
+                break;
+
         case TUNATTACHFILTER:
                 /* Can be set only for TAPs */
                 ret = -EINVAL;
@@ -2154,16 +2205,16 @@ out:
 
 static int tun_chr_open(struct inode *inode, struct file * file)
 {
+        struct net *net = current->nsproxy->net_ns;
         struct tun_file *tfile;
 
         DBG1(KERN_INFO, "tunX: tun_chr_open\n");
 
-        tfile = (struct tun_file *)sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL,
-                                            &tun_proto);
+        tfile = (struct tun_file *)sk_alloc(net, AF_UNSPEC, GFP_KERNEL,
+                                            &tun_proto, 0);
         if (!tfile)
                 return -ENOMEM;
         RCU_INIT_POINTER(tfile->tun, NULL);
-        tfile->net = get_net(current->nsproxy->net_ns);
         tfile->flags = 0;
         tfile->ifindex = 0;
 
@@ -2174,13 +2225,11 @@ static int tun_chr_open(struct inode *inode, struct file * file)
         tfile->socket.ops = &tun_socket_ops;
 
         sock_init_data(&tfile->socket, &tfile->sk);
-        sk_change_net(&tfile->sk, tfile->net);
 
         tfile->sk.sk_write_space = tun_sock_write_space;
         tfile->sk.sk_sndbuf = INT_MAX;
 
         file->private_data = tfile;
-        set_bit(SOCK_EXTERNALLY_ALLOCATED, &tfile->socket.flags);
         INIT_LIST_HEAD(&tfile->next);
 
         sock_set_flag(&tfile->sk, SOCK_ZEROCOPY);
@@ -2191,10 +2240,8 @@ static int tun_chr_open(struct inode *inode, struct file * file)
 static int tun_chr_close(struct inode *inode, struct file *file)
 {
         struct tun_file *tfile = file->private_data;
-        struct net *net = tfile->net;
 
         tun_detach(tfile, true);
-        put_net(net);
 
         return 0;
 }