Merge commit 'v3.16' into next

2014-10-01 00:44:04 +10:00
parent 35e1efd25a 19583ca584
commit 6c8ff877cd
467 changed files with 4195 additions and 2316 deletions
--- 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) {