Merge branch 'topic/uek-4.1/secureboot' of git://ca-git.us.oracle.com/linux-uek into...

* 'topic/uek-4.1/secureboot' of git://ca-git.us.oracle.com/linux-uek:
  selinux: enable setting security context in cgroup

diff --cc security/selinux/hooks.c
index 7f8d7f19e0446a5ed18a050a8b6e443eb0851797,91276c28e0f002836ebaed27c075d03239526d1c..f164d0c87279ab71f626d47e640fc775842faf43
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -403,8 -403,8 +403,9 @@@ static int selinux_is_sblabel_mnt(struc
        return sbsec->behavior == SECURITY_FS_USE_XATTR ||
                sbsec->behavior == SECURITY_FS_USE_TRANS ||
                sbsec->behavior == SECURITY_FS_USE_TASK ||
 +              sbsec->behavior == SECURITY_FS_USE_NATIVE ||
                /* Special handling. Genfs but also in-core setxattr handler */
+               !strcmp(sb->s_type->name, "cgroup") ||
                !strcmp(sb->s_type->name, "sysfs") ||
                !strcmp(sb->s_type->name, "pstore") ||
                !strcmp(sb->s_type->name, "debugfs") ||