Commit c5c62f1b authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

macvtap: fix network header pointer for VLAN tagged pkts 



Network header is set with offset ETH_HLEN but it is not true for VLAN
(multiple-)tagged and results in checksum issues in lower devices.

v2: leave skb->protocol untouched (thx Vlad), comment added
v3: moved after skb_probe_transport_header() call (thx Toshiaki)

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1513069e

drivers/net/macvtap.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -719,6 +719,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, 
	struct virtio_net_hdr vnet_hdr = { 0 };

	struct virtio_net_hdr vnet_hdr = { 0 };

	int vnet_hdr_len = 0;

	int vnet_hdr_len = 0;

	int copylen = 0;

	int copylen = 0;

	int depth;

	bool zerocopy = false;

	bool zerocopy = false;

	size_t linear;

	size_t linear;

	ssize_t n;

	ssize_t n;
@@ -804,6 +805,12 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, 




	skb_probe_transport_header(skb, ETH_HLEN);

	skb_probe_transport_header(skb, ETH_HLEN);





	/* Move network header to the right position for VLAN tagged packets */

	if ((skb->protocol == htons(ETH_P_8021Q) ||

	     skb->protocol == htons(ETH_P_8021AD)) &&

	    __vlan_get_protocol(skb, skb->protocol, &depth) != 0)

		skb_set_network_header(skb, depth);



	rcu_read_lock();

	rcu_read_lock();

	vlan = rcu_dereference(q->vlan);

	vlan = rcu_dereference(q->vlan);

	/* copy skb_ubuf_info for callback when skb has no error */

	/* copy skb_ubuf_info for callback when skb has no error */

CRA Git | Maintained and supported by SUSTech CRA and CCSE