From: David S. Miller Date: Tue, 18 Dec 2018 19:43:26 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: v5.4-rc1~2042^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fde9cd69a59f7ee405c87fff84bc08fa2a550e47;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== pull request (net): ipsec 2018-12-18 1) Fix error return code in xfrm_output_one() when no dst_entry is attached to the skb. From Wei Yongjun. 2) The xfrm state hash bucket count reported to userspace is off by one. Fix from Benjamin Poirier. 3) Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry. 4) Fix freeing of xfrm states on acquire. We use a dedicated slab cache for the xfrm states now, so free it properly with kmem_cache_free. From Mathias Krause. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller --- fde9cd69a59f7ee405c87fff84bc08fa2a550e47