iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ed32abb1ee716da02e7d795e3057efc1551168f2
linux/net
History
Xin Long 0c06d166ea 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: 3093fbe7ff ("route: Per route IP tunnel metadata via lightweight tunnel")
Fixes: 32a2b002ce ("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>
2019-11-11 14:43:02 -08:00
..
6lowpan
6lowpan: no need to check return value of debugfs_create functions
2019-07-06 12:50:01 +02:00
9p
Merge tag '9p-for-5.4' of git://github.com/martinetd/linux
2019-09-27 15:10:34 -07:00
802
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
8021q
net: remove unnecessary variables and callback
2019-10-24 14:53:49 -07:00
appletalk
appletalk: enforce CAP_NET_RAW for raw sockets
2019-09-24 16:37:18 +02:00
atm
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
ax25
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
batman-adv
batman-adv: Drop lockdep.h include for soft-interface.c
2019-11-03 08:30:58 +01:00
bluetooth
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
bpf
bpf: Allow __sk_buff tstamp in BPF_PROG_TEST_RUN
2019-10-15 16:24:26 -07:00
bpfilter
Merge tag 'kbuild-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
2019-07-12 16:03:16 -07:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
caif
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-02 13:54:56 -07:00
can
can: j1939: transport: j1939_xtp_rx_eoma_one(): Add sanity check for correct total message size
2019-11-04 21:47:23 +01:00
ceph
libceph: use ceph_kvmalloc() for osdmap arrays
2019-09-16 12:06:25 +02:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
dcb
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 201
2019-05-30 11:29:52 -07:00
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
decnet
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
dns_resolver
Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"
2019-07-10 18:43:43 -07:00
dsa
net: dsa: Add support for devlink resources
2019-11-05 18:09:45 -08:00
ethernet
net: add annotations on hh->hh_len lockless accesses
2019-11-07 20:07:30 -08:00
hsr
hsr: switch ->dellink() to ->ndo_uninit()
2019-07-11 14:37:45 -07:00
ieee802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-02 13:54:56 -07:00
ife
net: Fix Kconfig indentation
2019-09-26 08:56:17 +02:00
ipv4
lwtunnel: ignore any TUNNEL_OPTIONS_PRESENT flags set by users
2019-11-11 14:43:02 -08:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
iucv
net/af_iucv: mark expected switch fall-throughs
2019-07-29 10:26:14 -07:00
kcm
kcm: disable preemption in kcm_parse_func_strparser()
2019-09-27 10:27:14 +02:00
key
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-07-08 19:48:57 -07:00
l2tp
net: core: add generic lockdep keys
2019-10-24 14:53:48 -07:00
l3mdev
ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF
2019-06-23 13:24:17 -07:00
lapb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-17 20:20:36 -07:00
llc
net: silence data-races on sk_backlog.tail
2019-11-06 21:35:34 -08:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
mac802154
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174
2019-05-30 11:26:41 -07:00
mpls
ipv4: mpls: fix mpls_xmit for iptunnel
2019-08-25 14:34:08 -07:00
ncsi
net/ncsi: Disable global multicast filter
2019-09-19 18:04:40 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
netlabel
netlabel: remove redundant assignment to pointer iter
2019-09-01 11:45:02 -07:00
netlink
genetlink: do not parse attributes for families with zero maxattr
2019-10-13 11:20:03 -07:00
netrom
net: core: add generic lockdep keys
2019-10-24 14:53:48 -07:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
nsh
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
openvswitch
net: openvswitch: select vport upcall portid directly
2019-11-06 21:25:19 -08:00
packet
packet: fix data-race in fanout_flow_is_huge()
2019-11-08 14:06:19 -08:00
phonet
net: use skb_queue_empty_lockless() in poll() handlers
2019-10-28 13:33:41 -07:00
psample
net: sched: take reference to psample group in flow_action infra
2019-09-16 09:18:03 +02:00
qrtr
net: qrtr: Simplify 'qrtr_tun_release()'
2019-10-30 17:58:23 -07:00
rds
net/rds: Remove unnecessary null check
2019-10-17 15:23:03 -04:00
rfkill
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
rose
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-02 13:54:56 -07:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
sctp
sctp: add SCTP_PEER_ADDR_THLDS_V2 sockopt
2019-11-08 14:18:32 -08:00
smc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
strparser
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-06-22 08:59:24 -04:00
sunrpc
SUNRPC: Destroy the back channel when we destroy the host transport
2019-10-30 12:04:35 -04:00
switchdev
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152
2019-05-30 11:26:32 -07:00
tipc
tipc: add support for AEAD key setting via netlink
2019-11-08 14:01:59 -08:00
tls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-02 13:54:56 -07:00
vmw_vsock
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2019-11-09 11:04:37 -08:00
wimax
wimax: no need to check return value of debugfs_create functions
2019-08-10 15:25:47 -07:00
wireless
Merge tag 'mac80211-next-for-net-next-2019-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2019-11-08 11:36:48 -08:00
x25
net: use helpers to change sk_ack_backlog
2019-11-06 16:14:48 -08:00
xdp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2019-11-02 15:29:58 -07:00
xfrm
netfilter: drop bridge nf reset from nf_reset
2019-10-01 18:42:15 +02:00
compat.c
uio: make import_iovec()/compat_import_iovec() return bytes on success
2019-05-31 15:30:03 -06:00
Kconfig
devlink: Add packet trap infrastructure
2019-08-17 12:40:08 -07:00
Makefile
…
socket.c
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
sysctl_net.c
treewide: Add SPDX license identifier for missed files
2019-05-21 10:50:45 +02:00