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

Commit d8febb77 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

tun: Fix GSO meta-data handling in tun_get_user 



When we write the GSO meta-data in tun_get_user we end up advancing
the IO vector twice, thus exhausting the user buffer before we can
finish writing the packet.

Fixes: f5ff53b4 ("{macvtap,tun}_get_user(): switch to iov_iter")
Reported-by: default avatarMarcelo Ricardo Leitner <mleitner@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbc24658

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 


		if (gso.hdr_len > len)

			return -EINVAL;

		iov_iter_advance(from, tun->vnet_hdr_sz);

		iov_iter_advance(from, tun->vnet_hdr_sz - sizeof(gso));

	}



	if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {