Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c847d25 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

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 e0b46d0e ("tun: Use iovec iterators")
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 882288c0

drivers/net/tun.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {