From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 22 Mar 2017 08:52:58 +0000 (+0100)
Subject: Revert "UBUNTU: SAUCE: apparmor: fix cross ns perm of unix domain sockets"
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1055.59~601
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ef3fb7c913fccd5ae875d6d4883715dc892cc5af;p=mirror_ubuntu-artful-kernel.git

Revert "UBUNTU: SAUCE: apparmor: fix cross ns perm of unix domain sockets"

This reverts commit e6a5ccb5d0ac7d239bdaa65aa64d54a608f5fee8.

BugLink: https://bugs.launchpad.net/bugs/1666897

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

diff --git a/security/apparmor/af_unix.c b/security/apparmor/af_unix.c
index 757df1ade9a0..8178498f0a2f 100644
--- a/security/apparmor/af_unix.c
+++ b/security/apparmor/af_unix.c
@@ -515,7 +515,7 @@ static int profile_peer_perm(struct aa_profile *profile, const char *op, u32 req
 				      addr, len, &aad(sa)->info);
 		if (!peer_label)
 			peer_label = peer_ctx->label;
-		return fn_for_each_in_ns(peer_label, peerp,
+		return fn_for_each(peer_label, peerp,
 				   match_label(profile, peerp, state, request,
 					       sa));
 	}