summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorMilan Broz <gmazyland@gmail.com>2014-07-29 18:41:09 +0000
committerHerbert Xu <herbert@gondor.apana.org.au>2014-07-31 21:54:00 +0800
commit4c63f83c2c2e16a13ce274ee678e28246bd33645 (patch)
tree6f628e488975e2b74659fd9d1e5ad7c430be1f78 /crypto
parentf3c400ef473e00c680ea713a66196b05870b3710 (diff)
downloadop-kernel-dev-4c63f83c2c2e16a13ce274ee678e28246bd33645.zip
op-kernel-dev-4c63f83c2c2e16a13ce274ee678e28246bd33645.tar.gz
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>
Diffstat (limited to 'crypto')
-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 966f893..6a3ad80 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) {
OpenPOWER on IntegriCloud