From: Paul Moore <pmoore@redhat.com>
Date: Fri, 8 Nov 2013 18:56:38 +0000 (-0500)
Subject: Merge tag 'v3.12'
X-Git-Tag: v4.14-rc1~7043^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94851b18d4eb94f8bbf0d9176f7429bd8e371f62;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v3.12'

Linux 3.12
---

94851b18d4eb94f8bbf0d9176f7429bd8e371f62
diff --cc security/selinux/hooks.c
index c09211a4d7da,5b5231068516..777ee98273d1
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2665,15 -2628,11 +2665,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);