tun: unbreak truncated packet signalling
Subsystems (3)
PATCH v3 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 V2:
- use "copied" as the variable name instead to be more descriptive 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 , copied;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; } + copied = 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, copied, copy); len -= copy; - total += copy; + copied += 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, copied, copy); len -= copy; - total += copy; + copied += 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, copied, len); done: tun->dev->stats.tx_packets++;
Signature · 1 line
1.8.3.2
PATCH v3 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 V2:
- use total as the bytes of packet returned
Changes from V1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block
--- drivers/net/macvtap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/macvtap.c +6 -5
@@ -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, total;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; + total = copied = vnet_hdr_len; + total += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);
@@ -800,6 +801,7 @@ 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); + total +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy);
@@ -817,10 +819,9 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, } ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; done: -return ret ? ret : copied; +return ret ? ret : total; } static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
@@ -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 V3 2/2] macvtap: signal truncated packets
Quoted 9 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]>
-vlad
Quoted 63 lines
---
Changes from V2:
- use total as the bytes of packet returned
Changes from V1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block--- drivers/net/macvtap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/net/macvtap.c +6
-5@@ -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, total;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; + total = copied = vnet_hdr_len; + total += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);@@ -800,6 +801,7 @@ 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); + total +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy);@@ -817,10 +819,9 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, } ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; done: -return ret ? ret : copied; +return ret ? ret : total; } static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,@@ -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:
Re: [PATCH net V3 2/2] macvtap: signal truncated packets
In reply to Jason WangQuoted 9 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]>
Quoted 64 lines
---
Changes from V2:
- use total as the bytes of packet returned
Changes from V1:
- increase total unconditionally
- do not move the structure veth out of the vlan handling block--- drivers/net/macvtap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/net/macvtap.c +6
-5@@ -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, total;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; + total = copied = vnet_hdr_len; + total += skb->len;if (!vlan_tx_tag_present (skb)) len =min_t (int, skb->len, len);@@ -800,6 +801,7 @@ 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); + total +=VLAN_HLEN ; copy =min_t (int, vlan_offset, len); ret =skb_copy_datagram_const_iovec (skb,0 , iv, copied, copy);@@ -817,10 +819,9 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, } ret =skb_copy_datagram_const_iovec (skb, vlan_offset, iv, copied, len); - copied += len; done: -return ret ? ret : copied; +return ret ? ret : total; } static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,@@ -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
David Miller
maintainerRe: [PATCH net V3 2/2] macvtap: signal truncated packets
In reply to Jason WangFrom: Jason Wang <[email protected]>
Date: Wed, 11 Dec 2013 13:08:34 +0800
Quoted 9 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]>
Also applied and queued up for -stable, thanks.
Quoted 11 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]>
Quoted 65 lines
---
Changes from V2:
- use "copied" as the variable name instead to be more descriptive 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 , copied;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; } + copied = 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, copied, copy); len -= copy; - total += copy; + copied += 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, copied, copy); len -= copy; - total += copy; + copied += 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, copied, len); done: tun->dev->stats.tx_packets++;Signature · 1 line
1.8.3.2
David Miller
maintainerFrom: Jason Wang <[email protected]>
Date: Wed, 11 Dec 2013 13:08:33 +0800
Quoted 11 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]>
Applied and queued up for -stable.