diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-16 16:33:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-16 16:33:54 +0300 |
| commit | 6a787d6f593d57bec886718ef3fbbdc5bde70fcb (patch) | |
| tree | 542a5f774e433f179431e821c9b4fae5f4e4621f /crypto/des_generic.c | |
| parent | d871c321bb934fa63a3e0eaf837c1bafd4d853fc (diff) | |
| parent | 94802151894d482e82c324edf2c658f8e6b96508 (diff) | |
| download | linux-6a787d6f593d57bec886718ef3fbbdc5bde70fcb.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Copy policy family in clone_policy, otherwise this can
trigger a BUG_ON in af_key. From Herbert Xu.
2) Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find."
This added a regression with transport mode when no addresses
are configured on the policy template.
Both patches are stable candidates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/des_generic.c')
0 files changed, 0 insertions, 0 deletions