From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Wed, 26 Aug 2015 19:08:31 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/secureboot' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~295
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=751c2a838a6d20908159f3567569c5b6a4cba15d;p=users%2Fjedix%2Flinux-maple.git

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

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

751c2a838a6d20908159f3567569c5b6a4cba15d
diff --cc security/selinux/hooks.c
index 7f8d7f19e0446,91276c28e0f00..f164d0c87279a
--- a/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") ||