diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-07-05 14:58:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-05 14:58:22 -0700 |
| commit | 114b5b355ec0b6e83a6628a5ab5d03e50fd40a31 (patch) | |
| tree | 70f32db394b63b61d6d2657f8d4dfac925a066a5 /net/xfrm/Kconfig | |
| parent | bonding: validate ip header before check IPPROTO_IGMP (diff) | |
| parent | xfrm interface: fix memory leak on creation (diff) | |
| download | linux-dev-114b5b355ec0b6e83a6628a5ab5d03e50fd40a31.tar.xz linux-dev-114b5b355ec0b6e83a6628a5ab5d03e50fd40a31.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2019-07-05
1) Fix xfrm selector prefix length validation for
inter address family tunneling.
From Anirudh Gupta.
2) Fix a memleak in pfkey.
From Jeremy Sowden.
3) Fix SA selector validation to allow empty selectors again.
From Nicolas Dichtel.
4) Select crypto ciphers for xfrm_algo, this fixes some
randconfig builds. From Arnd Bergmann.
5) Remove a duplicated assignment in xfrm_bydst_resize.
From Cong Wang.
6) Fix a hlist corruption on hash rebuild.
From Florian Westphal.
7) Fix a memory leak when creating xfrm interfaces.
From Nicolas Dichtel.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/Kconfig')
| -rw-r--r-- | net/xfrm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index c967fc3c38c8..51bb6018f3bf 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig @@ -15,6 +15,8 @@ config XFRM_ALGO tristate select XFRM select CRYPTO + select CRYPTO_HASH + select CRYPTO_BLKCIPHER if INET config XFRM_USER |