From add136620b5ce55aae52aa446993d0f53d47cd16 Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Thu, 24 Jan 2008 15:30:52 -0500 Subject: [PATCH] --- yaml --- r: 76097 b: refs/heads/master c: 2e08c0c1c3977a5ddc88887dd3af1b26c433e9d0 h: refs/heads/master i: 76095: b90b586e4f5693ae03cd62219e6ec53d5943414c v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/mls.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 849a1ed7f0da..788fb3b578f5 100644 --- 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 index fb5d70a6628d..3bbcb5369af9 100644 --- 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; }