diff options
| author | Paul Moore <paul@paul-moore.com> | 2018-11-14 05:44:33 +0300 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2018-11-14 05:44:33 +0300 |
| commit | 877181a8d9dc663f7a73f77f50af714d7888ec3b (patch) | |
| tree | 1608534267eee0c2f6ecfc200607f16bfa5b2566 /security/selinux | |
| parent | c138325fb8713472d5a0c3c7258b9131bab40725 (diff) | |
| download | linux-877181a8d9dc663f7a73f77f50af714d7888ec3b.tar.xz | |
selinux: fix non-MLS handling in mls_context_to_sid()
Commit 95ffe194204a ("selinux: refactor mls_context_to_sid() and make
it stricter") inadvertently changed how we handle labels that did not
contain MLS information. This patch restores the proper behavior in
mls_context_to_sid() and adds a comment explaining the proper
behavior to help ensure this doesn't happen again.
Fixes: 95ffe194204a ("selinux: refactor mls_context_to_sid() and make it stricter")
Reported-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/ss/mls.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index 2fe459df3c85..b7efa2296969 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -245,9 +245,13 @@ int mls_context_to_sid(struct policydb *pol, char *rangep[2]; if (!pol->mls_enabled) { - if ((def_sid != SECSID_NULL && oldc) || (*scontext) == '\0') - return 0; - return -EINVAL; + /* + * With no MLS, only return -EINVAL if there is a MLS field + * and it did not come from an xattr. + */ + if (oldc && def_sid == SECSID_NULL) + return -EINVAL; + return 0; } /* |