diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
| commit | 7f4da8dfc74c2b4fb7191819ee718a78a0ca972b (patch) | |
| tree | 621e49aa88ee2609689d7726b54d6524d9445442 /crypto/af_alg.c | |
| parent | 6adc8f59727d07e7dcbc6d0c1116719c4c4042a9 (diff) | |
| parent | 245c531351ef282b69bcd2bd7d46bfc79234f9b4 (diff) | |
| download | linux-crypto-7f4da8dfc74c2b4fb7191819ee718a78a0ca972b.tar.gz linux-crypto-7f4da8dfc74c2b4fb7191819ee718a78a0ca972b.zip | |
Merge tag 'v3.17-rc1' into patchwork
Linux 3.17-rc1
Diffstat (limited to 'crypto/af_alg.c')
| -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) { |