aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-31 10:01:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-31 10:01:34 -0700
commit5196626dae54fdb5bee89fdd1232b2e03cc60956 (patch)
tree1f831f5559bf70693e545447c724283330bd6156
parent48418bb6e33f6b7f9a306a68414c0f72a2da9181 (diff)
parent4c63f83c2c2e16a13ce274ee678e28246bd33645 (diff)
downloadlinux-5196626dae54fdb5bee89fdd1232b2e03cc60956.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This adds missing SELinux labeling to AF_ALG sockets which apparently causes SELinux (or at least the SELinux people) to misbehave :)" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: af_alg - properly label AF_ALG socket
-rw-r--r--crypto/af_alg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 966f893711b..6a3ad801158 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) {