SELinux: mls.c whitespace, syntax, and static declaraction cleanups
This patch changes mls.c to fix whitespace and syntax issues. Things that are fixed may include (does not not have to include) whitespace at end of lines spaces followed by tabs spaces used instead of tabs spacing around parenthesis locateion of { around struct and else clauses location of * in pointer declarations removal of initialization of static data to keep it in the right section useless {} in if statemetns useless checking for NULL before kfree fixing of the indentation depth of switch statements and any number of other things I forgot to mention Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
719a2f8e5f
commit
1a5e6f8729
@ -32,7 +32,7 @@
|
|||||||
* Return the length in bytes for the MLS fields of the
|
* Return the length in bytes for the MLS fields of the
|
||||||
* security context string representation of `context'.
|
* security context string representation of `context'.
|
||||||
*/
|
*/
|
||||||
int mls_compute_context_len(struct context * context)
|
int mls_compute_context_len(struct context *context)
|
||||||
{
|
{
|
||||||
int i, l, len, head, prev;
|
int i, l, len, head, prev;
|
||||||
char *nm;
|
char *nm;
|
||||||
@ -305,7 +305,8 @@ int mls_context_to_sid(char oldc,
|
|||||||
*p++ = 0;
|
*p++ = 0;
|
||||||
|
|
||||||
/* Separate into range if exists */
|
/* Separate into range if exists */
|
||||||
if ((rngptr = strchr(scontextp, '.')) != NULL) {
|
rngptr = strchr(scontextp, '.');
|
||||||
|
if (rngptr != NULL) {
|
||||||
/* Remove '.' */
|
/* Remove '.' */
|
||||||
*rngptr++ = 0;
|
*rngptr++ = 0;
|
||||||
}
|
}
|
||||||
@ -449,11 +450,11 @@ int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
|
|||||||
that of the user's default clearance (but
|
that of the user's default clearance (but
|
||||||
only if the "fromcon" clearance dominates
|
only if the "fromcon" clearance dominates
|
||||||
the user's computed sensitivity level) */
|
the user's computed sensitivity level) */
|
||||||
if (mls_level_dom(user_clr, fromcon_clr)) {
|
if (mls_level_dom(user_clr, fromcon_clr))
|
||||||
*usercon_clr = *fromcon_clr;
|
*usercon_clr = *fromcon_clr;
|
||||||
} else if (mls_level_dom(fromcon_clr, user_clr)) {
|
else if (mls_level_dom(fromcon_clr, user_clr))
|
||||||
*usercon_clr = *user_clr;
|
*usercon_clr = *user_clr;
|
||||||
} else
|
else
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user