diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-10-01 00:44:04 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-10-01 00:44:04 +1000 |
| commit | d024e724d603107a03910deb57873a73cdf5469f (patch) | |
| tree | 00e99cff2b941972b39eb4121e447189f77db2b1 /crypto | |
| parent | c39bd2a6072a459553d73c9f9688072ea2e8055b (diff) | |
| parent | 786c516c6b1afa18b29ebd58b7f905c4cedba6d3 (diff) | |
| download | linux-crypto-d024e724d603107a03910deb57873a73cdf5469f.tar.gz linux-crypto-d024e724d603107a03910deb57873a73cdf5469f.zip | |
Merge commit 'v3.16' into next
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/af_alg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 966f8937..6a3ad801 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/net.h> #include <linux/rwsem.h> +#include <linux/security.h> struct alg_type_list { const struct af_alg_type *type; @@ -243,6 +244,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) sock_init_data(newsock, sk2); sock_graft(sk2, newsock); + security_sk_clone(sk, sk2); err = type->accept(ask->private, sk2); if (err) { |