Commit ee1a84fd authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Paul Moore

selinux: overhaul sidtab to fix bug and improve performance

Before this patch, during a policy reload the sidtab would become frozen
and trying to map a new context to SID would be unable to add a new
entry to sidtab and fail with -ENOMEM.

Such failures are usually propagated into userspace, which has no way of
distignuishing them from actual allocation failures and thus doesn't
handle them gracefully. Such situation can be triggered e.g. by the
following reproducer:

    while true; do load_policy; echo -n .; sleep 0.1; done &
    for (( i = 0; i < 1024; i++ )); do
        runcon -l s0:c$i echo -n x || break
        # or:
        # chcon -l s0:c$i <some_file> || break
    done

This patch overhauls the sidtab so it doesn't need to be frozen during
policy reload, thus solving the above problem.

The new SID table leverages the fact that SIDs are allocated
sequentially and are never invalidated and stores them in linear buckets
indexed by a tree structure. This brings several advantages:
  1. Fast SID -> context lookup - this lookup can now be done in
     logarithmic time complexity (usually in less than 4 array lookups)
     and can still be done safely without locking.
  2. No need to re-search the whole table on reverse lookup miss - after
     acquiring the spinlock only the newly added entries need to be
     searched, which means that reverse lookups that end up inserting a
     new entry are now about twice as fast.
  3. No need to freeze sidtab during policy reload - it is now possible
     to handle insertion of new entries even during sidtab conversion.

The tree structure of the new sidtab is able to grow automatically to up
to about 2^31 entries (at which point it should not have more than about
4 tree levels). The old sidtab had a theoretical capacity of almost 2^32
entries, but half of that is still more than enough since by that point
the reverse table lookups would become unusably slow anyway...

The number of entries per tree node is selected automatically so that
each node fits into a single page, which should be the easiest size for
kmalloc() to handle.

Note that the cache for reverse lookup is preserved with equivalent
logic. The only difference is that instead of storing pointers to the
hash table nodes it stores just the indices of the cached entries.

The new cache ensures that the indices are loaded/stored atomically, but
it still has the drawback that concurrent cache updates may mess up the
contents of the cache. Such situation however only reduces its
effectivity, not the correctness of lookups.

Tested by selinux-testsuite and thoroughly tortured by this simple
stress test:
```
function rand_cat() {
	echo $(( $RANDOM % 1024 ))
}

function do_work() {
	while true; do
		echo -n "system_u:system_r:kernel_t:s0:c$(rand_cat),c$(rand_cat)" \
			>/sys/fs/selinux/context 2>/dev/null || true
	done
}

do_work >/dev/null &
do_work >/dev/null &
do_work >/dev/null &

while load_policy; do echo -n .; sleep 0.1; done

kill %1
kill %2
kill %3
```

Link: https://github.com/SELinuxProject/selinux-kernel/issues/38Reported-by: default avatarOrion Poplawski <orion@nwra.com>
Reported-by: default avatarLi Kun <hw.likun@huawei.com>
Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Reviewed-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
[PM: most of sidtab.c merged by hand due to conflicts]
[PM: checkpatch fixes in mls.c, services.c, sidtab.c]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 24ed7fda
...@@ -436,16 +436,17 @@ int mls_setup_user_range(struct policydb *p, ...@@ -436,16 +436,17 @@ int mls_setup_user_range(struct policydb *p,
/* /*
* Convert the MLS fields in the security context * Convert the MLS fields in the security context
* structure `c' from the values specified in the * structure `oldc' from the values specified in the
* policy `oldp' to the values specified in the policy `newp'. * policy `oldp' to the values specified in the policy `newp',
* storing the resulting context in `newc'.
*/ */
int mls_convert_context(struct policydb *oldp, int mls_convert_context(struct policydb *oldp,
struct policydb *newp, struct policydb *newp,
struct context *c) struct context *oldc,
struct context *newc)
{ {
struct level_datum *levdatum; struct level_datum *levdatum;
struct cat_datum *catdatum; struct cat_datum *catdatum;
struct ebitmap bitmap;
struct ebitmap_node *node; struct ebitmap_node *node;
int l, i; int l, i;
...@@ -455,28 +456,25 @@ int mls_convert_context(struct policydb *oldp, ...@@ -455,28 +456,25 @@ int mls_convert_context(struct policydb *oldp,
for (l = 0; l < 2; l++) { for (l = 0; l < 2; l++) {
levdatum = hashtab_search(newp->p_levels.table, levdatum = hashtab_search(newp->p_levels.table,
sym_name(oldp, SYM_LEVELS, sym_name(oldp, SYM_LEVELS,
c->range.level[l].sens - 1)); oldc->range.level[l].sens - 1));
if (!levdatum) if (!levdatum)
return -EINVAL; return -EINVAL;
c->range.level[l].sens = levdatum->level->sens; newc->range.level[l].sens = levdatum->level->sens;
ebitmap_init(&bitmap); ebitmap_for_each_positive_bit(&oldc->range.level[l].cat,
ebitmap_for_each_positive_bit(&c->range.level[l].cat, node, i) { node, i) {
int rc; int rc;
catdatum = hashtab_search(newp->p_cats.table, catdatum = hashtab_search(newp->p_cats.table,
sym_name(oldp, SYM_CATS, i)); sym_name(oldp, SYM_CATS, i));
if (!catdatum) if (!catdatum)
return -EINVAL; return -EINVAL;
rc = ebitmap_set_bit(&bitmap, catdatum->value - 1, 1); rc = ebitmap_set_bit(&newc->range.level[l].cat,
catdatum->value - 1, 1);
if (rc) if (rc)
return rc; return rc;
cond_resched();
} }
ebitmap_destroy(&c->range.level[l].cat);
c->range.level[l].cat = bitmap;
} }
return 0; return 0;
......
...@@ -46,7 +46,8 @@ int mls_range_set(struct context *context, struct mls_range *range); ...@@ -46,7 +46,8 @@ int mls_range_set(struct context *context, struct mls_range *range);
int mls_convert_context(struct policydb *oldp, int mls_convert_context(struct policydb *oldp,
struct policydb *newp, struct policydb *newp,
struct context *context); struct context *oldc,
struct context *newc);
int mls_compute_sid(struct policydb *p, int mls_compute_sid(struct policydb *p,
struct context *scontext, struct context *scontext,
......
...@@ -1907,19 +1907,16 @@ struct convert_context_args { ...@@ -1907,19 +1907,16 @@ struct convert_context_args {
/* /*
* Convert the values in the security context * Convert the values in the security context
* structure `c' from the values specified * structure `oldc' from the values specified
* in the policy `p->oldp' to the values specified * in the policy `p->oldp' to the values specified
* in the policy `p->newp'. Verify that the * in the policy `p->newp', storing the new context
* context is valid under the new policy. * in `newc'. Verify that the context is valid
* under the new policy.
*/ */
static int convert_context(u32 key, static int convert_context(struct context *oldc, struct context *newc, void *p)
struct context *c,
void *p)
{ {
struct convert_context_args *args; struct convert_context_args *args;
struct context oldc;
struct ocontext *oc; struct ocontext *oc;
struct mls_range *range;
struct role_datum *role; struct role_datum *role;
struct type_datum *typdatum; struct type_datum *typdatum;
struct user_datum *usrdatum; struct user_datum *usrdatum;
...@@ -1929,76 +1926,65 @@ static int convert_context(u32 key, ...@@ -1929,76 +1926,65 @@ static int convert_context(u32 key,
args = p; args = p;
if (c->str) { if (oldc->str) {
struct context ctx; s = kstrdup(oldc->str, GFP_KERNEL);
rc = -ENOMEM;
s = kstrdup(c->str, GFP_KERNEL);
if (!s) if (!s)
goto out; return -ENOMEM;
rc = string_to_context_struct(args->newp, NULL, s, rc = string_to_context_struct(args->newp, NULL, s,
&ctx, SECSID_NULL); newc, SECSID_NULL);
kfree(s); if (rc == -EINVAL) {
if (!rc) {
pr_info("SELinux: Context %s became valid (mapped).\n",
c->str);
/* Replace string with mapped representation. */
kfree(c->str);
memcpy(c, &ctx, sizeof(*c));
goto out;
} else if (rc == -EINVAL) {
/* Retain string representation for later mapping. */ /* Retain string representation for later mapping. */
rc = 0; context_init(newc);
goto out; newc->str = s;
} else { newc->len = oldc->len;
return 0;
}
kfree(s);
if (rc) {
/* Other error condition, e.g. ENOMEM. */ /* Other error condition, e.g. ENOMEM. */
pr_err("SELinux: Unable to map context %s, rc = %d.\n", pr_err("SELinux: Unable to map context %s, rc = %d.\n",
c->str, -rc); oldc->str, -rc);
goto out; return rc;
} }
pr_info("SELinux: Context %s became valid (mapped).\n",
oldc->str);
return 0;
} }
rc = context_cpy(&oldc, c); context_init(newc);
if (rc)
goto out;
/* Convert the user. */ /* Convert the user. */
rc = -EINVAL; rc = -EINVAL;
usrdatum = hashtab_search(args->newp->p_users.table, usrdatum = hashtab_search(args->newp->p_users.table,
sym_name(args->oldp, SYM_USERS, c->user - 1)); sym_name(args->oldp,
SYM_USERS, oldc->user - 1));
if (!usrdatum) if (!usrdatum)
goto bad; goto bad;
c->user = usrdatum->value; newc->user = usrdatum->value;
/* Convert the role. */ /* Convert the role. */
rc = -EINVAL; rc = -EINVAL;
role = hashtab_search(args->newp->p_roles.table, role = hashtab_search(args->newp->p_roles.table,
sym_name(args->oldp, SYM_ROLES, c->role - 1)); sym_name(args->oldp, SYM_ROLES, oldc->role - 1));
if (!role) if (!role)
goto bad; goto bad;
c->role = role->value; newc->role = role->value;
/* Convert the type. */ /* Convert the type. */
rc = -EINVAL; rc = -EINVAL;
typdatum = hashtab_search(args->newp->p_types.table, typdatum = hashtab_search(args->newp->p_types.table,
sym_name(args->oldp, SYM_TYPES, c->type - 1)); sym_name(args->oldp,
SYM_TYPES, oldc->type - 1));
if (!typdatum) if (!typdatum)
goto bad; goto bad;
c->type = typdatum->value; newc->type = typdatum->value;
/* Convert the MLS fields if dealing with MLS policies */ /* Convert the MLS fields if dealing with MLS policies */
if (args->oldp->mls_enabled && args->newp->mls_enabled) { if (args->oldp->mls_enabled && args->newp->mls_enabled) {
rc = mls_convert_context(args->oldp, args->newp, c); rc = mls_convert_context(args->oldp, args->newp, oldc, newc);
if (rc) if (rc)
goto bad; goto bad;
} else if (args->oldp->mls_enabled && !args->newp->mls_enabled) {
/*
* Switching between MLS and non-MLS policy:
* free any storage used by the MLS fields in the
* context for all existing entries in the sidtab.
*/
mls_context_destroy(c);
} else if (!args->oldp->mls_enabled && args->newp->mls_enabled) { } else if (!args->oldp->mls_enabled && args->newp->mls_enabled) {
/* /*
* Switching between non-MLS and MLS policy: * Switching between non-MLS and MLS policy:
...@@ -2016,38 +2002,30 @@ static int convert_context(u32 key, ...@@ -2016,38 +2002,30 @@ static int convert_context(u32 key,
" the initial SIDs list\n"); " the initial SIDs list\n");
goto bad; goto bad;
} }
range = &oc->context[0].range; rc = mls_range_set(newc, &oc->context[0].range);
rc = mls_range_set(c, range);
if (rc) if (rc)
goto bad; goto bad;
} }
/* Check the validity of the new context. */ /* Check the validity of the new context. */
if (!policydb_context_isvalid(args->newp, c)) { if (!policydb_context_isvalid(args->newp, newc)) {
rc = convert_context_handle_invalid_context(args->state, rc = convert_context_handle_invalid_context(args->state, oldc);
&oldc);
if (rc) if (rc)
goto bad; goto bad;
} }
context_destroy(&oldc); return 0;
rc = 0;
out:
return rc;
bad: bad:
/* Map old representation to string and save it. */ /* Map old representation to string and save it. */
rc = context_struct_to_string(args->oldp, &oldc, &s, &len); rc = context_struct_to_string(args->oldp, oldc, &s, &len);
if (rc) if (rc)
return rc; return rc;
context_destroy(&oldc); context_destroy(newc);
context_destroy(c); newc->str = s;
c->str = s; newc->len = len;
c->len = len;
pr_info("SELinux: Context %s became invalid (unmapped).\n", pr_info("SELinux: Context %s became invalid (unmapped).\n",
c->str); newc->str);
rc = 0; return 0;
goto out;
} }
static void security_load_policycaps(struct selinux_state *state) static void security_load_policycaps(struct selinux_state *state)
...@@ -2091,6 +2069,7 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len) ...@@ -2091,6 +2069,7 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len)
struct policydb *oldpolicydb, *newpolicydb; struct policydb *oldpolicydb, *newpolicydb;
struct selinux_mapping *oldmapping; struct selinux_mapping *oldmapping;
struct selinux_map newmap; struct selinux_map newmap;
struct sidtab_convert_params convert_params;
struct convert_context_args args; struct convert_context_args args;
u32 seqno; u32 seqno;
int rc = 0; int rc = 0;
...@@ -2147,12 +2126,6 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len) ...@@ -2147,12 +2126,6 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len)
goto out; goto out;
} }
oldsidtab = state->ss->sidtab;
#if 0
sidtab_hash_eval(oldsidtab, "sids");
#endif
rc = policydb_read(newpolicydb, fp); rc = policydb_read(newpolicydb, fp);
if (rc) { if (rc) {
kfree(newsidtab); kfree(newsidtab);
...@@ -2184,6 +2157,8 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len) ...@@ -2184,6 +2157,8 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len)
goto err; goto err;
} }
oldsidtab = state->ss->sidtab;
/* /*
* Convert the internal representations of contexts * Convert the internal representations of contexts
* in the new SID table. * in the new SID table.
...@@ -2191,7 +2166,12 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len) ...@@ -2191,7 +2166,12 @@ int security_load_policy(struct selinux_state *state, void *data, size_t len)
args.state = state; args.state = state;
args.oldp = policydb; args.oldp = policydb;
args.newp = newpolicydb; args.newp = newpolicydb;
rc = sidtab_convert(oldsidtab, newsidtab, convert_context, &args);
convert_params.func = convert_context;
convert_params.args = &args;
convert_params.target = newsidtab;
rc = sidtab_convert(oldsidtab, &convert_params);
if (rc) { if (rc) {
pr_err("SELinux: unable to convert the internal" pr_err("SELinux: unable to convert the internal"
" representation of contexts in the new SID" " representation of contexts in the new SID"
......
This diff is collapsed.
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* A security identifier table (sidtab) is a hash table * A security identifier table (sidtab) is a lookup table
* of security context structures indexed by SID value. * of security context structures indexed by SID value.
* *
* Author : Stephen Smalley, <sds@tycho.nsa.gov> * Original author: Stephen Smalley, <sds@tycho.nsa.gov>
* Author: Ondrej Mosnacek, <omosnacek@gmail.com>
*
* Copyright (C) 2018 Red Hat, Inc.
*/ */
#ifndef _SS_SIDTAB_H_ #ifndef _SS_SIDTAB_H_
#define _SS_SIDTAB_H_ #define _SS_SIDTAB_H_
#include <linux/spinlock_types.h>
#include <linux/log2.h>
#include "context.h" #include "context.h"
struct sidtab_node { struct sidtab_entry_leaf {
u32 sid; /* security identifier */ struct context context;
struct context context; /* security context structure */ };
struct sidtab_node *next;
struct sidtab_node_inner;
struct sidtab_node_leaf;
union sidtab_entry_inner {
struct sidtab_node_inner *ptr_inner;
struct sidtab_node_leaf *ptr_leaf;
}; };
#define SIDTAB_HASH_BITS 7 /* align node size to page boundary */
#define SIDTAB_HASH_BUCKETS (1 << SIDTAB_HASH_BITS) #define SIDTAB_NODE_ALLOC_SHIFT PAGE_SHIFT
#define SIDTAB_HASH_MASK (SIDTAB_HASH_BUCKETS-1) #define SIDTAB_NODE_ALLOC_SIZE PAGE_SIZE
#define size_to_shift(size) ((size) == 1 ? 1 : (const_ilog2((size) - 1) + 1))
#define SIDTAB_INNER_SHIFT \
(SIDTAB_NODE_ALLOC_SHIFT - size_to_shift(sizeof(union sidtab_entry_inner)))
#define SIDTAB_INNER_ENTRIES ((size_t)1 << SIDTAB_INNER_SHIFT)
#define SIDTAB_LEAF_ENTRIES \
(SIDTAB_NODE_ALLOC_SIZE / sizeof(struct sidtab_entry_leaf))
#define SIDTAB_SIZE SIDTAB_HASH_BUCKETS #define SIDTAB_MAX_BITS 31 /* limited to INT_MAX due to atomic_t range */
#define SIDTAB_MAX (((u32)1 << SIDTAB_MAX_BITS) - 1)
/* ensure enough tree levels for SIDTAB_MAX entries */
#define SIDTAB_MAX_LEVEL \
DIV_ROUND_UP(SIDTAB_MAX_BITS - size_to_shift(SIDTAB_LEAF_ENTRIES), \
SIDTAB_INNER_SHIFT)
struct sidtab_node_leaf {
struct sidtab_entry_leaf entries[SIDTAB_LEAF_ENTRIES];
};
struct sidtab_node_inner {
union sidtab_entry_inner entries[SIDTAB_INNER_ENTRIES];
};
struct sidtab_isid_entry { struct sidtab_isid_entry {
int set; int set;
struct context context; struct context context;
}; };
struct sidtab_convert_params {
int (*func)(struct context *oldc, struct context *newc, void *args);
void *args;
struct sidtab *target;
};
#define SIDTAB_RCACHE_SIZE 3
struct sidtab { struct sidtab {
struct sidtab_node **htable; union sidtab_entry_inner roots[SIDTAB_MAX_LEVEL + 1];
unsigned int nel; /* number of elements */ atomic_t count;
unsigned int next_sid; /* next SID to allocate */ struct sidtab_convert_params *convert;
unsigned char shutdown;
#define SIDTAB_CACHE_LEN 3
struct sidtab_node *cache[SIDTAB_CACHE_LEN];
spinlock_t lock; spinlock_t lock;
/* reverse lookup cache */
atomic_t rcache[SIDTAB_RCACHE_SIZE];
/* index == SID - 1 (no entry for SECSID_NULL) */ /* index == SID - 1 (no entry for SECSID_NULL) */
struct sidtab_isid_entry isids[SECINITSID_NUM]; struct sidtab_isid_entry isids[SECINITSID_NUM];
}; };
...@@ -45,15 +86,10 @@ int sidtab_set_initial(struct sidtab *s, u32 sid, struct context *context); ...@@ -45,15 +86,10 @@ int sidtab_set_initial(struct sidtab *s, u32 sid, struct context *context);
struct context *sidtab_search(struct sidtab *s, u32 sid); struct context *sidtab_search(struct sidtab *s, u32 sid);
struct context *sidtab_search_force(struct sidtab *s, u32 sid); struct context *sidtab_search_force(struct sidtab *s, u32 sid);
int sidtab_convert(struct sidtab *s, struct sidtab *news, int sidtab_convert(struct sidtab *s, struct sidtab_convert_params *params);
int (*apply)(u32 sid,
struct context *context,
void *args),
void *args);
int sidtab_context_to_sid(struct sidtab *s, struct context *context, u32 *sid); int sidtab_context_to_sid(struct sidtab *s, struct context *context, u32 *sid);
void sidtab_hash_eval(struct sidtab *h, char *tag);
void sidtab_destroy(struct sidtab *s); void sidtab_destroy(struct sidtab *s);
#endif /* _SS_SIDTAB_H_ */ #endif /* _SS_SIDTAB_H_ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment