diff options
author | Milan Broz <gmazyland@gmail.com> | 2014-07-29 14:41:09 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-07-31 09:54:00 -0400 |
commit | 4c63f83c2c2e16a13ce274ee678e28246bd33645 (patch) | |
tree | 6f628e488975e2b74659fd9d1e5ad7c430be1f78 | |
parent | f3c400ef473e00c680ea713a66196b05870b3710 (diff) |
crypto: af_alg - properly label AF_ALG socket
Th AF_ALG socket was missing a security label (e.g. SELinux)
which means that socket was in "unlabeled" state.
This was recently demonstrated in the cryptsetup package
(cryptsetup v1.6.5 and later.)
See https://bugzilla.redhat.com/show_bug.cgi?id=1115120
This patch clones the sock's label from the parent sock
and resolves the issue (similar to AF_BLUETOOTH protocol family).
Cc: stable@vger.kernel.org
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-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 @@ | |||
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/net.h> | 22 | #include <linux/net.h> |
23 | #include <linux/rwsem.h> | 23 | #include <linux/rwsem.h> |
24 | #include <linux/security.h> | ||
24 | 25 | ||
25 | struct alg_type_list { | 26 | struct alg_type_list { |
26 | const struct af_alg_type *type; | 27 | const struct af_alg_type *type; |
@@ -243,6 +244,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) | |||
243 | 244 | ||
244 | sock_init_data(newsock, sk2); | 245 | sock_init_data(newsock, sk2); |
245 | sock_graft(sk2, newsock); | 246 | sock_graft(sk2, newsock); |
247 | security_sk_clone(sk, sk2); | ||
246 | 248 | ||
247 | err = type->accept(ask->private, sk2); | 249 | err = type->accept(ask->private, sk2); |
248 | if (err) { | 250 | if (err) { |