Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index cd8e02c94be0..bfabe180053e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1170,9 +1170,11 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         }
 
         if (tun->flags & IFF_VNET_HDR) {
-                if (len < tun->vnet_hdr_sz)
+                int vnet_hdr_sz = READ_ONCE(tun->vnet_hdr_sz);
+
+                if (len < vnet_hdr_sz)
                         return -EINVAL;
-                len -= tun->vnet_hdr_sz;
+                len -= vnet_hdr_sz;
 
                 if (!copy_from_iter_full(&gso, sizeof(gso), from))
                         return -EFAULT;
@@ -1183,7 +1185,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
 
                 if (tun16_to_cpu(tun, gso.hdr_len) > len)
                         return -EINVAL;
-                iov_iter_advance(from, tun->vnet_hdr_sz - sizeof(gso));
+                iov_iter_advance(from, vnet_hdr_sz - sizeof(gso));
         }
 
         if ((tun->flags & TUN_TYPE_MASK) == IFF_TAP) {
@@ -1335,7 +1337,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
                 vlan_hlen = VLAN_HLEN;
 
         if (tun->flags & IFF_VNET_HDR)
-                vnet_hdr_sz = tun->vnet_hdr_sz;
+                vnet_hdr_sz = READ_ONCE(tun->vnet_hdr_sz);
 
         total = skb->len + vlan_hlen + vnet_hdr_sz;
 
@@ -1360,7 +1362,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
                         return -EINVAL;
 
                 if (virtio_net_hdr_from_skb(skb, &gso,
-                                            tun_is_little_endian(tun))) {
+                                            tun_is_little_endian(tun), true)) {
                         struct skb_shared_info *sinfo = skb_shinfo(skb);
                         pr_err("unexpected GSO type: "
                                "0x%x, gso_size %d, hdr_len %d\n",