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

Commit 923347bb authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

tun: unbreak truncated packet signalling 



Commit 6680ec68
(tuntap: hardware vlan tx support) breaks the truncated packet signal by never
return a length greater than iov length in tun_put_user(). This patch fixes this
by always return the length of packet plus possible vlan header. Caller can
detect the truncated packet by comparing the return value and the size of iov
length.

Reported-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fffc15a5

drivers/net/tun.c

+12 −11
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ static ssize_t tun_put_user(struct tun_struct *tun, 
			    const struct iovec *iv, int len)

{

	struct tun_pi pi = { 0, skb->protocol };

	ssize_t total = 0;

	struct {

		__be16 h_vlan_proto;

		__be16 h_vlan_TCI;

	} veth;

	ssize_t total = 0, off = 0;

	int vlan_offset = 0;



	if (!(tun->flags & TUN_NO_PI)) {
@@ -1248,14 +1252,11 @@ static ssize_t tun_put_user(struct tun_struct *tun, 
		total += tun->vnet_hdr_sz;

	}



	off = total;

	if (!vlan_tx_tag_present(skb)) {

		len = min_t(int, skb->len, len);

	} else {

		int copy, ret;

		struct {

			__be16 h_vlan_proto;

			__be16 h_vlan_TCI;

		} veth;



		veth.h_vlan_proto = skb->vlan_proto;

		veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
@@ -1264,22 +1265,22 @@ static ssize_t tun_put_user(struct tun_struct *tun, 
		len = min_t(int, skb->len + VLAN_HLEN, len);



		copy = min_t(int, vlan_offset, len);

		ret = skb_copy_datagram_const_iovec(skb, 0, iv, total, copy);

		ret = skb_copy_datagram_const_iovec(skb, 0, iv, off, copy);

		len -= copy;

		total += copy;

		off += copy;

		if (ret || !len)

			goto done;



		copy = min_t(int, sizeof(veth), len);

		ret = memcpy_toiovecend(iv, (void *)&veth, total, copy);

		ret = memcpy_toiovecend(iv, (void *)&veth, off, copy);

		len -= copy;

		total += copy;

		off += copy;

		if (ret || !len)

			goto done;

	}



	skb_copy_datagram_const_iovec(skb, vlan_offset, iv, total, len);

	total += len;

	skb_copy_datagram_const_iovec(skb, vlan_offset, iv, off, len);

	total += skb->len + (vlan_offset ? sizeof(veth) : 0);



done:

	tun->dev->stats.tx_packets++;