diff options
| author |   Ondrej Mosnacek <omosnace@redhat.com> | 2020-04-17 10:11:56 +0200 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2020-04-17 16:04:34 -0400 |
| commit | 50077289804c9bd4e6cfd5b3a10d4da0487f7e42 (patch) | |
| tree | d0eec42d8fa215c2a80419f934159286d5d025d5 /security/selinux/ss/policydb.c | |
| parent | selinux: store role transitions in a hash table (diff) | |
| download | linux-dev-50077289804c9bd4e6cfd5b3a10d4da0487f7e42.tar.xz linux-dev-50077289804c9bd4e6cfd5b3a10d4da0487f7e42.zip | |
selinux: hash context structure directly
Always hashing the string representation is inefficient. Just hash the
contents of the structure directly (using jhash). If the context is
invalid (str & len are set), then hash the string as before, otherwise
hash the structured data.
Since the context hashing function is now faster (about 10 times), this
patch decreases the overhead of security_transition_sid(), which is
called from many hooks.
The jhash function seemed as a good choice, since it is used as the
default hashing algorithm in rhashtable.
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Reviewed-by: Jeff Vander Stoep <jeffv@google.com>
Tested-by: Jeff Vander Stoep <jeffv@google.com>
[PM: fixed some spelling errors in the comments pointed out by JVS]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 4f0cfffd008d..2849bc362828 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -862,11 +862,8 @@ int policydb_load_isids(struct policydb *p, struct sidtab *s) if (!name) continue; - rc = context_add_hash(p, &c->context[0]); - if (rc) { - sidtab_destroy(s); - goto out; - } + context_add_hash(&c->context[0]); + rc = sidtab_set_initial(s, sid, &c->context[0]); if (rc) { pr_err("SELinux: unable to load initial SID %s.\n", |