summaryrefslogtreecommitdiffstats
path: root/include/linux/dlm.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-12-18 11:43:26 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-18 11:43:26 -0800
commitfde9cd69a59f7ee405c87fff84bc08fa2a550e47 (patch)
tree886cc9496c272128a0b27b1b23cf6f14c292e209 /include/linux/dlm.h
parent8d013b7910599a06405fb37d6def4dde7cab7984 (diff)
parent4a135e538962cb00a9667c82e7d2b9e4d7cd7177 (diff)
downloadlinux-stable-fde9cd69a59f7ee405c87fff84bc08fa2a550e47.tar.gz
linux-stable-fde9cd69a59f7ee405c87fff84bc08fa2a550e47.tar.bz2
linux-stable-fde9cd69a59f7ee405c87fff84bc08fa2a550e47.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'include/linux/dlm.h')
0 files changed, 0 insertions, 0 deletions