lwtunnel: ignore any TUNNEL_OPTIONS_PRESENT flags set by users
authorXin Long <lucien.xin@gmail.com>
Sun, 10 Nov 2019 04:26:21 +0000 (12:26 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Nov 2019 22:43:02 +0000 (14:43 -0800)
commit0c06d166eacdb3176fbce589d44ffe810a95ab97
treeda5773f701df489f457fc2efa542ed870dc4ef0a
parent58e8494eb033eb9134989dbc52e2a236e3f8a462
lwtunnel: ignore any TUNNEL_OPTIONS_PRESENT flags set by users

TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT|TUNNEL_VXLAN_OPT|
TUNNEL_ERSPAN_OPT) flags should be set only according to
tb[LWTUNNEL_IP_OPTS], which is done in ip_tun_parse_opts().

When setting info key.tun_flags, the TUNNEL_OPTIONS_PRESENT
bits in tb[LWTUNNEL_IP(6)_FLAGS] passed from users should
be ignored.

While at it, replace all (TUNNEL_GENEVE_OPT|TUNNEL_VXLAN_OPT|
TUNNEL_ERSPAN_OPT) with 'TUNNEL_OPTIONS_PRESENT'.

Fixes: 3093fbe7ff4b ("route: Per route IP tunnel metadata via lightweight tunnel")
Fixes: 32a2b002ce61 ("ipv6: route: per route IP tunnel metadata via lightweight tunnel")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel_core.c