Commit 5196626d authored Jul 31, 2014 by Linus Torvalds

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

parents 48418bb6 4c63f83c

crypto/af_alg.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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) {