Skip to content

Commit 32db469

Browse files
cgzonespcmoore
authored andcommitted
selinux: improve symtab string hashing
The number of buckets is calculated by performing a binary AND against the mask of the hash table, which is one less than its size (which is a power of two). This leads to all top bits being discarded, requiring for short or similar inputs a hash function with a good avalanche effect. Use djb2a: # current common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11 classes: 134 entries and 100/256 buckets used, longest chain length 5, sum of chain length^2 234 roles: 15 entries and 6/16 buckets used, longest chain length 5, sum of chain length^2 57 types: 4448 entries and 3016/8192 buckets used, longest chain length 41, sum of chain length^2 14922 users: 7 entries and 3/8 buckets used, longest chain length 3, sum of chain length^2 17 bools: 306 entries and 221/512 buckets used, longest chain length 4, sum of chain length^2 524 levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1 categories: 1024 entries and 400/1024 buckets used, longest chain length 4, sum of chain length^2 2740 # patch common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11 classes: 134 entries and 101/256 buckets used, longest chain length 3, sum of chain length^2 210 roles: 15 entries and 9/16 buckets used, longest chain length 3, sum of chain length^2 31 types: 4448 entries and 3459/8192 buckets used, longest chain length 5, sum of chain length^2 6778 users: 7 entries and 5/8 buckets used, longest chain length 3, sum of chain length^2 13 bools: 306 entries and 236/512 buckets used, longest chain length 5, sum of chain length^2 470 levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1 categories: 1024 entries and 518/1024 buckets used, longest chain length 7, sum of chain length^2 2992 Signed-off-by: Christian Göttsche <[email protected]> [PM: line length fixes in the commit message] Signed-off-by: Paul Moore <[email protected]>
1 parent 0fd0b4f commit 32db469

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

security/selinux/ss/symtab.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212

1313
static unsigned int symhash(const void *key)
1414
{
15-
const char *p, *keyp;
16-
unsigned int size;
17-
unsigned int val;
18-
19-
val = 0;
20-
keyp = key;
21-
size = strlen(keyp);
22-
for (p = keyp; (p - keyp) < size; p++)
23-
val = (val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^
24-
(*p);
25-
return val;
15+
/*
16+
* djb2a
17+
* Public domain from cdb v0.75
18+
*/
19+
unsigned int hash = 5381;
20+
unsigned char c;
21+
22+
while ((c = *(const unsigned char *)key++))
23+
hash = ((hash << 5) + hash) ^ c;
24+
25+
return hash;
2626
}
2727

2828
static int symcmp(const void *key1, const void *key2)

0 commit comments

Comments
 (0)