mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
selinux: make mls_compute_sid always polyinstantiate
This patch removes the requirement that the new and related object types differ in order to polyinstantiate by MLS level. This allows MLS polyinstantiation to occur in the absence of explicit type_member rules or when the type has not changed. Potential users of this support include pam_namespace.so (directory polyinstantiation) and the SELinux X support (property polyinstantiation). Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
1996a10948
commit
2e08c0c1c3
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user