Files
linux/include/linux
Toshiaki Makita 99ba9a9728 vlan: Fix out of order vlan headers with reorder header off
[ Upstream commit cbe7128c4b ]

With reorder header off, received packets are untagged in skb_vlan_untag()
called from within __netif_receive_skb_core(), and later the tag will be
inserted back in vlan_do_receive().

This caused out of order vlan headers when we create a vlan device on top
of another vlan device, because vlan_do_receive() inserts a tag as the
outermost vlan tag. E.g. the outer tag is first removed in skb_vlan_untag()
and inserted back in vlan_do_receive(), then the inner tag is next removed
and inserted back as the outermost tag.

This patch fixes the behaviour by inserting the inner tag at the right
position.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-05-30 07:52:16 +02:00
..
2016-07-08 16:23:11 +02:00
2018-04-24 09:36:39 +02:00
2017-06-08 18:52:36 -07:00
2017-12-25 14:26:33 +01:00
2017-07-03 16:56:28 -06:00
2018-02-22 15:42:23 +01:00
2017-08-30 14:40:40 +02:00
2017-08-24 13:23:03 -07:00
2016-10-28 08:48:16 -06:00
2018-02-22 15:42:23 +01:00
2017-07-17 13:42:48 +02:00
2017-08-03 19:09:26 -07:00
2017-08-07 17:22:14 +02:00
2018-02-22 15:42:23 +01:00
2017-03-21 10:15:47 +02:00
2017-05-18 10:07:40 -04:00
2017-06-21 14:37:12 -04:00
2018-02-22 15:42:24 +01:00
2017-08-15 18:23:52 +02:00
2017-01-05 15:01:55 -06:00
2016-05-11 22:37:54 +02:00
2017-08-14 13:33:39 -07:00
2017-02-24 17:46:57 -08:00
2017-08-28 20:51:22 +02:00
2017-09-07 11:53:11 +02:00
2018-02-22 15:42:23 +01:00
2018-02-22 15:42:23 +01:00
2016-04-25 15:09:11 -04:00
2017-07-06 11:30:07 -04:00
2017-07-25 18:05:25 +02:00
2017-09-25 08:56:05 -06:00
2017-05-26 10:10:37 +02:00
2017-08-06 20:55:29 -07:00
2018-02-22 15:42:23 +01:00
2018-05-22 18:54:04 +02:00
2017-07-06 16:24:30 -07:00
2017-08-16 16:28:47 -07:00
2018-02-22 15:42:23 +01:00
2017-07-24 17:50:37 +02:00
2017-08-31 18:50:14 +02:00
2017-08-15 09:02:07 -07:00
2017-08-15 09:02:08 -07:00