vlan: Do not put vlan headers back on bridge and macvlan ports (28f9ee22) · Commits · 戴 / test

When a vlan is configured with REORDER_HEADER set to 0, the vlan header is put back into the packet and makes it appear that the vlan header is still there even after it's been processed. This posses a problem for bridge and macvlan ports. The packets passed to those device may be forwarded and at the time of the forward, vlan headers end up being unexpectedly present. With the patch, we make sure that we do not put the vlan header back (when REORDER_HEADER is 0) if a bridge or macvlan has been configured on top of the vlan device. Signed-off-by:

Vladislav Yasevich <vyasevic@redhat.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/linux/netdevice.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -3857,6 +3857,11 @@ static inline bool netif_is_bridge_master(const struct net_device *dev)
		return dev->priv_flags & IFF_EBRIDGE;
		}

		static inline bool netif_is_bridge_port(const struct net_device *dev)
		{
		return dev->priv_flags & IFF_BRIDGE_PORT;
		}

		static inline bool netif_is_ovs_master(const struct net_device *dev)
		{
		return dev->priv_flags & IFF_OPENVSWITCH;

net/8021q/vlan_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,9 @@ bool vlan_do_receive(struct sk_buff **skbp)
		skb->pkt_type = PACKET_HOST;
		}

		if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR)) {
		if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR) &&
		!netif_is_macvlan_port(vlan_dev) &&
		!netif_is_bridge_port(vlan_dev)) {
		unsigned int offset = skb->data - skb_mac_header(skb);

		/*

Admin message