From: James Morris <james.l.morris@oracle.com>
Date: Tue, 22 Oct 2013 11:26:41 +0000 (+1100)
Subject: Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f799c97f37fc0ee2c9c427fa0dada637394886c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
---

6f799c97f37fc0ee2c9c427fa0dada637394886c
diff --cc security/selinux/hooks.c
index a5091ec06aa6,c09211a4d7da..6d0bf5c0c832
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2629,11 -2665,15 +2666,11 @@@ static int selinux_inode_init_security(
  		isec->initialized = 1;
  	}
  
- 	if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP))
+ 	if (!ss_initialized || !(sbsec->flags & SBLABEL_MNT))
  		return -EOPNOTSUPP;
  
 -	if (name) {
 -		namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
 -		if (!namep)
 -			return -ENOMEM;
 -		*name = namep;
 -	}
 +	if (name)
 +		*name = XATTR_SELINUX_SUFFIX;
  
  	if (value && len) {
  		rc = security_sid_to_context_force(newsid, &context, &clen);