diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/ss/mls.c | 11 |
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, | |||
537 | /* Use the process effective MLS attributes. */ | 537 | /* Use the process effective MLS attributes. */ |
538 | return mls_context_cpy_low(newcontext, scontext); | 538 | return mls_context_cpy_low(newcontext, scontext); |
539 | case AVTAB_MEMBER: | 539 | case AVTAB_MEMBER: |
540 | /* Only polyinstantiate the MLS attributes if | 540 | /* Use the process effective MLS attributes. */ |
541 | the type is being polyinstantiated */ | 541 | return mls_context_cpy_low(newcontext, scontext); |
542 | if (newcontext->type != tcontext->type) { | ||
543 | /* Use the process effective MLS attributes. */ | ||
544 | return mls_context_cpy_low(newcontext, scontext); | ||
545 | } else { | ||
546 | /* Use the related object MLS attributes. */ | ||
547 | return mls_context_cpy(newcontext, tcontext); | ||
548 | } | ||
549 | default: | 542 | default: |
550 | return -EINVAL; | 543 | return -EINVAL; |
551 | } | 544 | } |