diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-31 14:44:50 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-31 14:44:50 -0400 |
| commit | 1bd930d84ef6c382e9e18f16cbbf7c120b28cb21 (patch) | |
| tree | d33796bef5dff5fbdedf213e88b15698bd62f2c8 /crypto | |
| parent | 3448c4ac838aa08a8e4400c56d7d613b3f3d3c8e (diff) | |
| parent | e21af7dfe5795138dc2466dc5684d3297acd48a9 (diff) | |
Merge tag 'v3.14.16' into v3.14-rt
This is the 3.14.16 stable release
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 966f893711b3..6a3ad8011585 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) { |