1) Several patches to fix the fallout from the recent
tree based policy lookup work. From Florian Westphal.
2) Fix VTI for IPCOMP for 'not compressed' IPCOMP packets.
We need an extra IPIP handler to process these packets
correctly. From Su Yanjun.
3) Fix validation of template and selector families for
MODE_ROUTEOPTIMIZATION with ipv4-in-ipv6 packets.
This can lead to a stack-out-of-bounds because
flowi4 struct is treated as flowi6 struct.
Fix from Florian Westphal.
4) Restore the default behaviour of the xfrm set-mark
in the output path. This was changed accidentally
when mark setting was extended to the input path.
From Benedict Wong.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit d972f3dce8d161e2142da0ab1ef25df00e2f21a9:
packet: Do not leak dev refcounts on error exit (2019-01-08 21:41:40 -0500)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
for you to fetch changes up to e2612cd496e7b465711d219ea6118893d7253f52:
xfrm: Make set-mark default behavior backward compatible (2019-01-16 13:10:55
+0100)
----------------------------------------------------------------
Benedict Wong (1):
xfrm: Make set-mark default behavior backward compatible
Florian Westphal (8):
selftests: xfrm: add block rules with adjacent/overlapping subnets
xfrm: policy: use hlist rcu variants on inexact insert, part 2
xfrm: policy: increment xfrm_hash_generation on hash rebuild
xfrm: policy: delete inexact policies from inexact list on hash rebuild
xfrm: policy: fix reinsertion on node merge
selftests: xfrm: alter htresh to trigger move of policies to hash table
xfrm: policy: fix infinite loop when merging src-nodes
xfrm: refine validation of template and selector families
Su Yanjun (1):
vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel
net/ipv4/ip_vti.c | 50 ++++++++++
net/xfrm/xfrm_policy.c | 63 ++++++------
net/xfrm/xfrm_user.c | 13 ++-
tools/testing/selftests/net/xfrm_policy.sh | 153 ++++++++++++++++++++++++-----
4 files changed, 223 insertions(+), 56 deletions(-)
