---

yaml --- r: 76097 b: refs/heads/master c: 2e08c0c h: refs/heads/master i: 76095: b90b586 v: v3
git-mirror · Jan 25, 2008 · add1366 · add1366
1 parent 457dc53
commit add1366
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1996a10948e50e546dc2b64276723c0b64d3173b
+refs/heads/master: 2e08c0c1c3977a5ddc88887dd3af1b26c433e9d0
diff --git a/trunk/security/selinux/ss/mls.c b/trunk/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;
 	}