From: Jason Wang <jasowang@redhat.com>
Date: Thu, 13 Nov 2014 08:54:14 +0000 (+0800)
Subject: tun: fix issues of iovec iterators using in tun_put_user()
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~199
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c847d254146d32c86574a1b16923ff91bb784dd;p=pandora-kernel.git

tun: fix issues of iovec iterators using in tun_put_user()

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>
---

Reading git-diff-tree failed