tun: fix issues of iovec iterators using in tun_put_user()
authorJason Wang <jasowang@redhat.com>
Thu, 13 Nov 2014 08:54:14 +0000 (16:54 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Nov 2014 19:33:22 +0000 (14:33 -0500)
This patch fixes two issues after using iovec iterators:
- vlan_offset should be initialized to zero, otherwise unexpected offset
  will be used in skb_copy_datagram_iter()
- advance iovec iterator when vnet_hdr_sz is greater than sizeof(gso), this
  is the case when mergeable rx buffer were enabled for a virt guest.

Fixes e0b46d0ee9c240c7430a47e9b0365674d4a04522 ("tun: Use iovec iterators")
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index 2ff769bf3f3512ea0e4d3d53cce2a4c4abb65cef..e3fa65a4d96cd725b6475dc670946825c8421c01 100644 (file)
@@ -1235,7 +1235,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
 {
        struct tun_pi pi = { 0, skb->protocol };
        ssize_t total;
-       int vlan_offset;
+       int vlan_offset = 0;
        int vlan_hlen = 0;
        int vnet_hdr_sz = 0;
 
@@ -1304,6 +1304,8 @@ static ssize_t tun_put_user(struct tun_struct *tun,
 
                if (copy_to_iter(&gso, sizeof(gso), iter) != sizeof(gso))
                        return -EFAULT;
+
+               iov_iter_advance(iter, vnet_hdr_sz - sizeof(gso));
        }
 
        if (vlan_hlen) {