]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Fixed updating of ethertype in function skb_mpls_pop
authorMartin Varghese <martin.varghese@nokia.com>
Mon, 2 Dec 2019 05:19:51 +0000 (10:49 +0530)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:24:19 +0000 (14:24 -0300)
commit833c6eb65202196b3d40c58afa6c8f8c956523ff
tree1065f28623c6cdabc5c9f79959985b02816271e1
parent9abf978d2d500830fde3a4d8d66c6cea914287d3
Fixed updating of ethertype in function skb_mpls_pop

BugLink: https://bugs.launchpad.net/bugs/1856870
[ Upstream commit 040b5cfbcefa263ccf2c118c4938308606bb7ed8 ]

The skb_mpls_pop was not updating ethertype of an ethernet packet if the
packet was originally received from a non ARPHRD_ETHER device.

In the below OVS data path flow, since the device corresponding to port 7
is an l3 device (ARPHRD_NONE) the skb_mpls_pop function does not update
the ethertype of the packet even though the previous push_eth action had
added an ethernet header to the packet.

recirc_id(0),in_port(7),eth_type(0x8847),
mpls(label=12/0xfffff,tc=0/0,ttl=0/0x0,bos=1/1),
actions:push_eth(src=00:00:00:00:00:00,dst=00:00:00:00:00:00),
pop_mpls(eth_type=0x800),4

Fixes: ed246cee09b9 ("net: core: move pop MPLS functionality from OvS to core helper")
Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
include/linux/skbuff.h
net/core/skbuff.c
net/openvswitch/actions.c
net/sched/act_mpls.c