Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: make mls_compute_sid always polyinstantiate
  security/selinux: constify function pointer tables and fields
  security: add a secctx_to_secid() hook
  security: call security_file_permission from rw_verify_area
  security: remove security_sb_post_mountroot hook
  Security: remove security.h include from mm.h
  Security: remove security_file_mmap hook sparse-warnings (NULL as 0).
  Security: add get, set, and cloning of superblock security information
  security/selinux: Add missing "space"

1 files changed, 2 insertions, 9 deletions

diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index fb5d70a6628d..3bbcb5369af9 100644
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -537,15 +537,8 @@ int mls_compute_sid(struct context *scontext,
                         /* Use the process effective MLS attributes. */
                         return mls_context_cpy_low(newcontext, scontext);
         case AVTAB_MEMBER:
-                /* Only polyinstantiate the MLS attributes if
-                   the type is being polyinstantiated */
-                if (newcontext->type != tcontext->type) {
-                        /* Use the process effective MLS attributes. */
-                        return mls_context_cpy_low(newcontext, scontext);
-                } else {
-                        /* Use the related object MLS attributes. */
-                        return mls_context_cpy(newcontext, tcontext);
-                }
+                /* Use the process effective MLS attributes. */
+                return mls_context_cpy_low(newcontext, scontext);
         default:
                 return -EINVAL;
         }