]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Revert "UBUNTU: SAUCE: apparmor: null profiles should inherit parent control flags"
authorStefan Bader <stefan.bader@canonical.com>
Wed, 22 Mar 2017 08:49:25 +0000 (09:49 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 22 Mar 2017 10:20:12 +0000 (11:20 +0100)
This reverts commit 3432cc02cf1d85f2d54a3ec60211340262976005.

BugLink: https://bugs.launchpad.net/bugs/1666897
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
security/apparmor/policy.c

index f5f286ab70b42860f9477ac64d45226499124511..f2ffcf109e28b0efd8cd2fa66f53a5e723657e62 100644 (file)
@@ -350,7 +350,6 @@ name:
        profile->label.flags |= FLAG_NULL;
        if (hat)
                profile->label.flags |= FLAG_HAT;
-       profile->path_flags = parent->path_flags;
 
        /* released on free_profile */
        rcu_assign_pointer(profile->parent, aa_get_profile(parent));