Merge tag 'v3.12'
authorPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
committerPaul Moore <pmoore@redhat.com>
Tue, 26 Nov 2013 22:32:55 +0000 (17:32 -0500)
Linux 3.12

1  2 
MAINTAINERS
include/linux/security.h
security/capability.c
security/security.c
security/selinux/hooks.c
security/selinux/include/xfrm.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index c09211a4d7da2b88398d702b87defb1f3a1d2f00,5b5231068516e46bb529efb3df38051124d2ef85..777ee98273d16c3bc4e09fb126ead5e635f095fd
@@@ -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);
Simple merge