diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-05-07 23:51:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-07 23:51:30 -0400 |
| commit | 1822f638e8af1f5e277e61d2245ffa826c22a4a4 (patch) | |
| tree | fe9109c95fa47dc388331d6b6887c3a11018abd2 /include/net | |
| parent | net/tls: Fix connection stall on partial tls record (diff) | |
| parent | vti6: Change minimum MTU to IPV4_MIN_MTU, vti6 can carry IPv4 too (diff) | |
| download | linux-dev-1822f638e8af1f5e277e61d2245ffa826c22a4a4.tar.xz linux-dev-1822f638e8af1f5e277e61d2245ffa826c22a4a4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2018-05-07
1) Always verify length of provided sadb_key to fix a
slab-out-of-bounds read in pfkey_add. From Kevin Easton.
2) Make sure that all states are really deleted
before we check that the state lists are empty.
Otherwise we trigger a warning.
3) Fix MTU handling of the VTI6 interfaces on
interfamily tunnels. From Stefano Brivio.
====================
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 a872379b69da..45e75c36b738 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -375,6 +375,7 @@ struct xfrm_input_afinfo { int xfrm_input_register_afinfo(const struct xfrm_input_afinfo *afinfo); int xfrm_input_unregister_afinfo(const struct xfrm_input_afinfo *afinfo); +void xfrm_flush_gc(void); void xfrm_state_delete_tunnel(struct xfrm_state *x); struct xfrm_type { |