|
@@ -32,7 +32,7 @@
|
|
|
* Return the length in bytes for the MLS fields of the
|
|
|
* 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;
|
|
|
char *nm;
|
|
@@ -86,7 +86,7 @@ int mls_compute_context_len(struct context * context)
|
|
|
* Update `*scontext' to point to the end of the MLS fields.
|
|
|
*/
|
|
|
void mls_sid_to_context(struct context *context,
|
|
|
- char **scontext)
|
|
|
+ char **scontext)
|
|
|
{
|
|
|
char *scontextp, *nm;
|
|
|
int i, l, head, prev;
|
|
@@ -146,7 +146,7 @@ void mls_sid_to_context(struct context *context,
|
|
|
|
|
|
if (l == 0) {
|
|
|
if (mls_level_eq(&context->range.level[0],
|
|
|
- &context->range.level[1]))
|
|
|
+ &context->range.level[1]))
|
|
|
break;
|
|
|
else
|
|
|
*scontextp++ = '-';
|
|
@@ -305,20 +305,21 @@ int mls_context_to_sid(char oldc,
|
|
|
*p++ = 0;
|
|
|
|
|
|
/* Separate into range if exists */
|
|
|
- if ((rngptr = strchr(scontextp, '.')) != NULL) {
|
|
|
+ rngptr = strchr(scontextp, '.');
|
|
|
+ if (rngptr != NULL) {
|
|
|
/* Remove '.' */
|
|
|
*rngptr++ = 0;
|
|
|
}
|
|
|
|
|
|
catdatum = hashtab_search(policydb.p_cats.table,
|
|
|
- scontextp);
|
|
|
+ scontextp);
|
|
|
if (!catdatum) {
|
|
|
rc = -EINVAL;
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
rc = ebitmap_set_bit(&context->range.level[l].cat,
|
|
|
- catdatum->value - 1, 1);
|
|
|
+ catdatum->value - 1, 1);
|
|
|
if (rc)
|
|
|
goto out;
|
|
|
|
|
@@ -395,7 +396,7 @@ int mls_from_string(char *str, struct context *context, gfp_t gfp_mask)
|
|
|
rc = -ENOMEM;
|
|
|
} else {
|
|
|
rc = mls_context_to_sid(':', &tmpstr, context,
|
|
|
- NULL, SECSID_NULL);
|
|
|
+ NULL, SECSID_NULL);
|
|
|
kfree(freestr);
|
|
|
}
|
|
|
|
|
@@ -406,7 +407,7 @@ int mls_from_string(char *str, struct context *context, gfp_t gfp_mask)
|
|
|
* Copies the MLS range `range' into `context'.
|
|
|
*/
|
|
|
static inline int mls_range_set(struct context *context,
|
|
|
- struct mls_range *range)
|
|
|
+ struct mls_range *range)
|
|
|
{
|
|
|
int l, rc = 0;
|
|
|
|
|
@@ -423,7 +424,7 @@ static inline int mls_range_set(struct context *context,
|
|
|
}
|
|
|
|
|
|
int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
|
|
|
- struct context *usercon)
|
|
|
+ struct context *usercon)
|
|
|
{
|
|
|
if (selinux_mls_enabled) {
|
|
|
struct mls_level *fromcon_sen = &(fromcon->range.level[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
|
|
|
only if the "fromcon" clearance dominates
|
|
|
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;
|
|
|
- } else if (mls_level_dom(fromcon_clr, user_clr)) {
|
|
|
+ else if (mls_level_dom(fromcon_clr, user_clr))
|
|
|
*usercon_clr = *user_clr;
|
|
|
- } else
|
|
|
+ else
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
@@ -525,7 +526,7 @@ int mls_compute_sid(struct context *scontext,
|
|
|
rtr->target_class == tclass) {
|
|
|
/* Set the range from the rule */
|
|
|
return mls_range_set(newcontext,
|
|
|
- &rtr->target_range);
|
|
|
+ &rtr->target_range);
|
|
|
}
|
|
|
}
|
|
|
/* Fallthrough */
|