tun: unbreak truncated packet signalling
Subsystems (3)
PATCH v2 1/2 tun: unbreak truncated packet signalling
Commit 6680ec68eff47d36f67b4351bc9836fd6cba9532
(tuntap: hardware vlan tx support) breaks the truncated packet signal by nev return a length greater than iov length in tun_put_user(). This patch fixes 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 io length.
---
Changes from v1:
- increase total unconditionally
- do not move veth structure out of the vlan handing block
--- drivers/net/tun.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/tun.c +9 -7
@@ -1184,7 +1184,7 @@ static ssize_t tun_put_user(struct tun_struct *tun, {struct tun_pi pi = {0 , skb->protocol };ssize_t total =0 ; -int vlan_offset =0 ; +int vlan_offset =0 , offset;if (!(tun->flags &TUN_NO_PI )) {if ((len -=sizeof (pi)) <0 )
@@ -1248,6 +1248,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, total += tun->vnet_hdr_sz; } + offset = total; + total += skb->len;if (!vlan_tx_tag_present (skb)) { len =min_t (int, skb->len, len); }else {
@@ -1262,24 +1264,24 @@ static ssize_t tun_put_user(struct tun_struct *tun, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + total +=VLAN_HLEN ; 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, offset, copy); len -= copy; - total += copy; + offset += 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, offset, copy); len -= copy; - total += copy; + offset += 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, offset, len); done: tun->dev->stats.tx_packets++;
Signature · 1 line
1.8.3.2
PATCH v2 2/2 macvtap: signal truncated packets
macvtap_put_user() never return a value grater than iov length, this in fact bypasses the truncated checking in macvtap_recvmsg(). Fix this by always returning the size of packet plus the possible vlan header to let the trunca checking work.
---
Changes from v1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block
--- drivers/net/macvtap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/macvtap.c +10 -9
@@ -770,7 +770,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,int ret;int vnet_hdr_len =0 ;int vlan_offset =0 ; -int copied; +int copied, offset;if (q->flags &IFF_VNET_HDR ) {struct virtio_net_hdr vnet_hdr;
@@ -785,7 +785,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,if (memcpy_toiovecend (iv, (void *)&vnet_hdr,0 ,sizeof (vnet_hdr)))return -EFAULT ; } - copied = vnet_hdr_len; + offset = copied = vnet_hdr_len; + copied += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);
@@ -800,24 +801,24 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + copied +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); - ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy); + ret =skb_copy_datagram_const_iovec (skb,0 , iv, offset, copy); len -= copy; - copied += copy; + offset += copy;if (ret || !len) goto done; copy =min_t (int,sizeof (veth), len); - ret =memcpy_toiovecend (iv, (void *)&veth, copied, copy); + ret =memcpy_toiovecend (iv, (void *)&veth, offset, copy); len -= copy; - copied += copy; + offset += copy;if (ret || !len) goto done; } - ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; + ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, offset, len); done:return ret ? ret : copied;
@@ -875,7 +876,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, } ret =macvtap_do_read (q, iocb, iv, len, file->f_flags &O_NONBLOCK ); - ret =min_t (ssize_t, ret, len);/* XXX copied from tun.c. Why? */ + ret =min_t (ssize_t, ret, len);if (ret >0 ) iocb->ki_pos = ret; out:
Signature · 1 line
1.8.3.2
Re: [PATCH net V2 2/2] macvtap: signal truncated packets
Quoted 61 lines · Jason Wang
macvtap_put_user()never return a value grater than iov length, this in fact bypasses the truncated checking inmacvtap_recvmsg(). Fix this by always returning the size of packet plus the possible vlan header to let the trunca checking work.Cc Vlad Yasevich <[email protected]>Cc Zhi Yong Wu <[email protected]>Cc Michael S. Tsirkin <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes from v1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block--- drivers/net/macvtap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)drivers/net/macvtap.c +8
-6@@ -770,7 +770,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,int ret;int vnet_hdr_len =0 ;int vlan_offset =0 ; -int copied; +int copied, offset;if (q->flags &IFF_VNET_HDR ) {struct virtio_net_hdr vnet_hdr;@@ -785,7 +785,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,if (memcpy_toiovecend (iv, (void *)&vnet_hdr,0 ,sizeof (vnet_hdr)))return -EFAULT ; } - copied = vnet_hdr_len; + offset = copied = vnet_hdr_len; + copied += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);@@ -800,24 +801,24 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + copied +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); - ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy); + ret =skb_copy_datagram_const_iovec (skb,0 , iv, offset, copy); len -= copy; - copied += copy; + offset += copy;if (ret || !len) goto done; copy =min_t (int,sizeof (veth), len); - ret =memcpy_toiovecend (iv, (void *)&veth, copied, copy); + ret =memcpy_toiovecend (iv, (void *)&veth, offset, copy); len -= copy; - copied += copy; + offset += copy;
drivers/net/macvtap.c static ssize_t macvtap_put_user(struct macvtap_queue *q, · line 824
Quoted 10 lines
drivers/net/macvtap.c +1
-2if (ret || !len) goto done; } - ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; + ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, offset, len); done:return ret ? ret : copied;
I commented on this already. copied is how much we copied, so its value is correct.
You want to name the new one total_len or something along these lines and return it.
Quoted 11 lines
drivers/net/macvtap.c +1
-1@@ -875,7 +876,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, } ret =macvtap_do_read (q, iocb, iv, len, file->f_flags &O_NONBLOCK ); - ret =min_t (ssize_t, ret, len);/* XXX copied from tun.c. Why? */ + ret =min_t (ssize_t, ret, len);if (ret >0 ) iocb->ki_pos = ret; out:Signature · 1 line
1.8.3.2
Re: [PATCH net V2 2/2] macvtap: signal truncated packets
Quoted 70 lines · Michael S. Tsirkin
Quoted 69 lines · Jason Wang
Quoted 69 lines
macvtap_put_user()never return a value grater than iov length, this in fact bypasses the truncated checking inmacvtap_recvmsg(). Fix this by always returning the size of packet plus the possible vlan header to let the trunca checking work.Cc Vlad Yasevich <[email protected]>Cc Zhi Yong Wu <[email protected]>Cc Michael S. Tsirkin <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes from v1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block--- drivers/net/macvtap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)drivers/net/macvtap.c +9
-8@@ -770,7 +770,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,int ret;int vnet_hdr_len =0 ;int vlan_offset =0 ; -int copied; +int copied, offset;if (q->flags &IFF_VNET_HDR ) {struct virtio_net_hdr vnet_hdr;@@ -785,7 +785,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,if (memcpy_toiovecend (iv, (void *)&vnet_hdr,0 ,sizeof (vnet_hdr)))return -EFAULT ; } - copied = vnet_hdr_len; + offset = copied = vnet_hdr_len; + copied += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);@@ -800,24 +801,24 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + copied +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); - ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy); + ret =skb_copy_datagram_const_iovec (skb,0 , iv, offset, copy); len -= copy; - copied += copy; + offset += copy;if (ret || !len) goto done; copy =min_t (int,sizeof (veth), len); - ret =memcpy_toiovecend (iv, (void *)&veth, copied, copy); + ret =memcpy_toiovecend (iv, (void *)&veth, offset, copy); len -= copy; - copied += copy; + offset += copy;if (ret || !len) goto done; } - ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; + ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, offset, len);
Quoted 7 lines
Quoted 2 lines
drivers/net/macvtap.c static ssize_t macvtap_put_user(struct macvtap_queue *q, · line 824
Quoted 2 lines
drivers/net/macvtap.c +0
-0done:return ret ? ret : copied;I commented on this already. copied is how much we copied, so its value is correct.
You want to name the new onetotal_lenor something along these lines and return it.
Ok, to be same with tun, I will use "total" in V3.
Thanks
Quoted 62 lines · Jason Wang
Commit
6680ec68eff47d36f67b4351bc9836fd6cba9532
(tuntap: hardware vlan tx support) breaks the truncated packet signal by nev return a length greater than iov length intun_put_user(). This patch fixes 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 io length.Cc Zhi Yong Wu <[email protected]>Cc Michael S. Tsirkin <[email protected]>Signed-off-by Vlad Yasevich <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes from v1:
- increase total unconditionally
- do not move veth structure out of the vlan handing block--- drivers/net/tun.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/net/tun.c +8
-5@@ -1184,7 +1184,7 @@ static ssize_t tun_put_user(struct tun_struct *tun, {struct tun_pi pi = {0 , skb->protocol };ssize_t total =0 ; -int vlan_offset =0 ; +int vlan_offset =0 , offset;if (!(tun->flags &TUN_NO_PI )) {if ((len -=sizeof (pi)) <0 )@@ -1248,6 +1248,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, total += tun->vnet_hdr_sz; } + offset = total; + total += skb->len;if (!vlan_tx_tag_present (skb)) { len =min_t (int, skb->len, len); }else {@@ -1262,24 +1264,24 @@ static ssize_t tun_put_user(struct tun_struct *tun, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + total +=VLAN_HLEN ; 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, offset, copy); len -= copy; - total += copy; + offset += 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, offset, copy); len -= copy; - total += copy; + offset += copy;
drivers/net/tun.c static ssize_t tun_put_user(struct tun_struct *tun, · line 1287
Quoted 10 lines
drivers/net/tun.c +1
-2if (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, offset, len); done: tun->dev->stats.tx_packets++;
offset is not descriptive. I would call new variable "copied", and change all code to use that, do
total = copied + skb->len, total is then the total length.
Quoted 2 lines
Signature · 1 line
1.8.3.2
Quoted 71 lines · Michael S. Tsirkin
Quoted 70 lines · Jason Wang
Quoted 70 lines
Commit
6680ec68eff47d36f67b4351bc9836fd6cba9532
(tuntap: hardware vlan tx support) breaks the truncated packet signal by nev return a length greater than iov length intun_put_user(). This patch fixes 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 io length.Cc Zhi Yong Wu <[email protected]>Cc Michael S. Tsirkin <[email protected]>Signed-off-by Vlad Yasevich <[email protected]>Signed-off-by Jason Wang <[email protected]>---
Changes from v1:
- increase total unconditionally
- do not move veth structure out of the vlan handing block--- drivers/net/tun.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/net/tun.c +9
-7@@ -1184,7 +1184,7 @@ static ssize_t tun_put_user(struct tun_struct *tun, {struct tun_pi pi = {0 , skb->protocol };ssize_t total =0 ; -int vlan_offset =0 ; +int vlan_offset =0 , offset;if (!(tun->flags &TUN_NO_PI )) {if ((len -=sizeof (pi)) <0 )@@ -1248,6 +1248,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, total += tun->vnet_hdr_sz; } + offset = total; + total += skb->len;if (!vlan_tx_tag_present (skb)) { len =min_t (int, skb->len, len); }else {@@ -1262,24 +1264,24 @@ static ssize_t tun_put_user(struct tun_struct *tun, vlan_offset = offsetof(struct vlan_ethhdr , h_vlan_proto); len =min_t (int, skb->len +VLAN_HLEN , len); + total +=VLAN_HLEN ; 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, offset, copy); len -= copy; - total += copy; + offset += 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, offset, copy); len -= copy; - total += copy; + offset += 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, offset, len);
Quoted 6 lines
Quoted 2 lines
drivers/net/tun.c static ssize_t tun_put_user(struct tun_struct *tun, · line 1287
Quoted 2 lines
drivers/net/tun.c +0
-0done: tun->dev->stats.tx_packets++;offset is not descriptive. I would call new variable "copied", and change all code to use that, do
total = copied +skb->len, total is then the total length.
Ok, will do it in v3.
David Miller
maintainerYou and Michael are still discussing these changes it seems.
I accidently commited the first version of these patches, but then immediately reverted that after I saw the followups.
Let me know when you have something both of you are happy with.
Thanks.
Quoted 8 lines · David Miller
You and Michael are still discussing these changes it seems.
I accidently commited the first version of these patches, but then immediately reverted that after I saw the followups.
Let me know when you have something both of you are happy with.
Thanks.
Sure, I will post v3 which should address all comments from Michael.
Thanks