From: David S. Miller Date: Thu, 16 Nov 2017 13:33:54 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: v4.19~2127^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a787d6f593d57bec886718ef3fbbdc5bde70fcb;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== 1) Copy policy family in clone_policy, otherwise this can trigger a BUG_ON in af_key. From Herbert Xu. 2) Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find." This added a regression with transport mode when no addresses are configured on the policy template. Both patches are stable candidates. ==================== Signed-off-by: David S. Miller --- 6a787d6f593d57bec886718ef3fbbdc5bde70fcb