hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 truncated
checking work.

Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2013-12-09 18:25:17 +08:00 committed by David S. Miller
parent 923347bb83
commit 730054da38
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/macvtap.c
View File

@ -767,10 +767,14 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
const struct sk_buff *skb, const struct sk_buff *skb,
const struct iovec *iv, int len) const struct iovec *iv, int len)
{ {
int ret; int ret, off;
int vnet_hdr_len = 0; int vnet_hdr_len = 0;
int vlan_offset = 0; int vlan_offset = 0;
int copied; int copied;
struct {
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
if (q->flags & IFF_VNET_HDR) { if (q->flags & IFF_VNET_HDR) {
struct virtio_net_hdr vnet_hdr; struct virtio_net_hdr vnet_hdr;
@ -785,16 +789,13 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr))) if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
return -EFAULT; return -EFAULT;
} }
copied = vnet_hdr_len; off = copied = vnet_hdr_len;
if (!vlan_tx_tag_present(skb)) if (!vlan_tx_tag_present(skb))
len = min_t(int, skb->len, len); len = min_t(int, skb->len, len);
else { else {
int copy; int copy;
struct {
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
veth.h_vlan_proto = skb->vlan_proto; veth.h_vlan_proto = skb->vlan_proto;
veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb)); veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
@ -802,22 +803,22 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
len = min_t(int, skb->len + VLAN_HLEN, len); len = min_t(int, skb->len + VLAN_HLEN, len);
copy = min_t(int, vlan_offset, len); 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, off, copy);
len -= copy; len -= copy;
copied += copy; off += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
copy = min_t(int, sizeof(veth), len); copy = min_t(int, sizeof(veth), len);
ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy); ret = memcpy_toiovecend(iv, (void *)&veth, off, copy);
len -= copy; len -= copy;
copied += copy; off += copy;
if (ret || !len) if (ret || !len)
goto done; goto done;
} }
ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len); ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, off, len);
copied += len; copied += skb->len + (vlan_offset ? sizeof(veth) : 0);
done: done:
return ret ? ret : copied; 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 = 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) if (ret > 0)
iocb->ki_pos = ret; iocb->ki_pos = ret;
out: out: