From: Guillaume Nault <gna...@redhat.com>
Date: Sat, 25 Jul 2020 15:06:47 +0200
> In multiproto mode, bareudp_xmit() accepts sending multicast MPLS and
> IPv6 packets regardless of the bareudp ethertype. In practice, this
> let an IP tunnel send multicast MPLS packets, or an MPLS tunnel send
> IPv6 packets.
>
> We need to restrict the test further, so that the multiproto mode only
> enables
> * IPv6 for IPv4 tunnels,
> * or multicast MPLS for unicast MPLS tunnels.
>
> To improve clarity, the protocol validation is moved to its own
> function, where each logical test has its own condition.
>
> v2: s/ntohs/htons/
>
> Fixes: 4b5f67232d95 ("net: Special handling for IP & MPLS.")
> Signed-off-by: Guillaume Nault <gna...@redhat.com>
Applied and queued up for -stable, thanks.
