From: David S. Miller <davem@davemloft.net>
Date: Sun, 27 Jan 2019 18:30:01 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Tag: v5.15~7084^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c303a9b297fab7ab874fed35f7fd5d9ab559edca;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2019-01-25

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.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

c303a9b297fab7ab874fed35f7fd5d9ab559edca