Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

[uclinux-h8/linux.git] / security / apparmor / policy.c

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 421681c..cf5fd22 100644 (file)
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -903,6 +903,10 @@ struct aa_profile *aa_lookup_profile(struct aa_namespace *ns, const char *hname)
        profile = aa_get_profile(__lookup_profile(&ns->base, hname));
        read_unlock(&ns->lock);
 
+       /* the unconfined profile is not in the regular profile list */
+       if (!profile && strcmp(hname, "unconfined") == 0)
+               profile = aa_get_profile(ns->unconfined);
+
        /* refcount released by caller */
        return profile;
 }