Merge remote-tracking branch 'selinux/master'

Conflicts:
	security/selinux/hooks.c

diff --cc include/linux/security.h
Simple merge

diff --cc security/capability.c
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
index a5091ec06aa62816798510e40a1bcf005d2abd3d,c156f5eb1aea26b7b4d8b281e32974563f281449..6d0bf5c0c8323a4f0f56f1879fce1a6c4c53e8fa
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -680,21 -708,14 +718,19 @@@ static int selinux_set_mnt_opts(struct 
        if (strcmp(sb->s_type->name, "proc") == 0)
                sbsec->flags |= SE_SBPROC;
  
 -      /* Determine the labeling behavior to use for this filesystem type. */
 -      rc = security_fs_use(sb);
 -      if (rc) {
 -              printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
 -                     __func__, sb->s_type->name, rc);
 -              goto out;
 +      if (!sbsec->behavior) {
 +              /*
 +               * Determine the labeling behavior to use for this
 +               * filesystem type.
 +               */
-               rc = security_fs_use((sbsec->flags & SE_SBPROC) ?
-                                       "proc" : sb->s_type->name,
-                                       &sbsec->behavior, &sbsec->sid);
++              rc = security_fs_use(sb);
 +              if (rc) {
 +                      printk(KERN_WARNING
 +                              "%s: security_fs_use(%s) returned %d\n",
 +                                      __func__, sb->s_type->name, rc);
 +                      goto out;
 +              }
        }
 -
        /* sets the context of the superblock for the fs being mounted. */
        if (fscontext_sid) {
                rc = may_context_mount_sb_relabel(fscontext_sid, sbsec, cred);
@@@ -2629,11 -2596,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);

diff --cc security/selinux/include/security.h
index 8fd8e18ea34019c863d91ba88268b8c4018f3410,7aad3a1389d155d0f5f1bfc209264df5f0d9b0e9..fe341ae370049b39ac2012d665a64dd4dc9af198
--- 1/security/selinux/include/security.h
--- 2/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@@ -169,11 -173,8 +173,10 @@@ int security_get_allow_unknown(void)
  #define SECURITY_FS_USE_GENFS         4 /* use the genfs support */
  #define SECURITY_FS_USE_NONE          5 /* no labeling support */
  #define SECURITY_FS_USE_MNTPOINT      6 /* use mountpoint labeling */
 +#define SECURITY_FS_USE_NATIVE                7 /* use native label support */
 +#define SECURITY_FS_USE_MAX           7 /* Highest SECURITY_FS_USE_XXX */
  
- int security_fs_use(const char *fstype, unsigned int *behavior,
-       u32 *sid);
+ int security_fs_use(struct super_block *sb);
  
  int security_genfs_sid(const char *fstype, char *name, u16 sclass,
        u32 *sid);

diff --cc security/selinux/include/xfrm.h
Simple merge

diff --cc security/selinux/ss/policydb.c
Simple merge