diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-18 11:43:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-18 11:43:26 -0800 |
| commit | fde9cd69a59f7ee405c87fff84bc08fa2a550e47 (patch) | |
| tree | 886cc9496c272128a0b27b1b23cf6f14c292e209 /include/net | |
| parent | 8d013b7910599a06405fb37d6def4dde7cab7984 (diff) | |
| parent | 4a135e538962cb00a9667c82e7d2b9e4d7cd7177 (diff) | |
| download | linux-fde9cd69a59f7ee405c87fff84bc08fa2a550e47.tar.gz linux-fde9cd69a59f7ee405c87fff84bc08fa2a550e47.tar.bz2 linux-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/net')
| -rw-r--r-- | include/net/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 0eb390c205af..da588def3c61 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1552,6 +1552,7 @@ int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk, int (*func)(struct xfrm_state *, int, void*), void *); void xfrm_state_walk_done(struct xfrm_state_walk *walk, struct net *net); struct xfrm_state *xfrm_state_alloc(struct net *net); +void xfrm_state_free(struct xfrm_state *x); struct xfrm_state *xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, const struct flowi *fl, |