Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vhost-net: fix handle_rx buffer size

Browse Source 
Take vlan header length into account, when vlan id is stored as
vlan_tci. Otherwise tagged packets coming from macvtap will be
truncated.

Signed-off-by: Basil Gor <basil.gor@gmail.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Basil Gor 2012-05-03 22:55:23 +00:00 committed by David S. Miller
parent 13a8e0c8cd
commit c53cff5e42
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/vhost/net.c
View File

@ -24,6 +24,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
#include <linux/if_macvlan.h> #include <linux/if_macvlan.h>
#include <linux/if_vlan.h>
#include <net/sock.h> #include <net/sock.h>
@ -283,8 +284,12 @@ static int peek_head_len(struct sock *sk)
spin_lock_irqsave(&sk->sk_receive_queue.lock, flags); spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
head = skb_peek(&sk->sk_receive_queue); head = skb_peek(&sk->sk_receive_queue);
if (likely(head)) if (likely(head)) {
len = head->len; len = head->len;
if (vlan_tx_tag_present(head))
len += VLAN_HLEN;
}
spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags); spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
return len; return len;
} }