RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hashtab: update 

Avoid overflowing number of elements in hashtab_insert().

Use identical type for hashed values to avoid implicit conversions.

Declare tag parameter of hashtab_hash_eval() const since it is only
printed.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2023-07-14 20:44:12 +02:00 committed by James Carter
parent 511f43478f
commit 0d1445067c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsepol/include/sepol/policydb/hashtab.h
View File

@ -108,7 +108,7 @@ extern int hashtab_map(hashtab_t h,
hashtab_datum_t d, hashtab_datum_t d,
void *args), void *args); void *args), void *args);
extern void hashtab_hash_eval(hashtab_t h, char *tag); extern void hashtab_hash_eval(hashtab_t h, const char *tag);
#ifdef __cplusplus #ifdef __cplusplus
} }

14
libsepol/src/hashtab.c
View File

@ -103,10 +103,10 @@ static void hashtab_check_resize(hashtab_t h)
int hashtab_insert(hashtab_t h, hashtab_key_t key, hashtab_datum_t datum) int hashtab_insert(hashtab_t h, hashtab_key_t key, hashtab_datum_t datum)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t prev, cur, newnode; hashtab_ptr_t prev, cur, newnode;
if (!h) if (!h || h->nel == UINT32_MAX)
return SEPOL_ENOMEM; return SEPOL_ENOMEM;
hashtab_check_resize(h); hashtab_check_resize(h);
@ -144,7 +144,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
void (*destroy) (hashtab_key_t k, void (*destroy) (hashtab_key_t k,
hashtab_datum_t d, void *args), void *args) hashtab_datum_t d, void *args), void *args)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t cur, last; hashtab_ptr_t cur, last;
if (!h) if (!h)
@ -176,7 +176,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
hashtab_datum_t hashtab_search(hashtab_t h, const_hashtab_key_t key) hashtab_datum_t hashtab_search(hashtab_t h, const_hashtab_key_t key)
{ {
int hvalue; unsigned int hvalue;
hashtab_ptr_t cur; hashtab_ptr_t cur;
if (!h) if (!h)
@ -240,10 +240,10 @@ int hashtab_map(hashtab_t h,
return SEPOL_OK; return SEPOL_OK;
} }
void hashtab_hash_eval(hashtab_t h, char *tag) void hashtab_hash_eval(hashtab_t h, const char *tag)
{ {
unsigned int i; unsigned int i;
int chain_len, slots_used, max_chain_len; size_t chain_len, slots_used, max_chain_len;
hashtab_ptr_t cur; hashtab_ptr_t cur;
slots_used = 0; slots_used = 0;
@ -264,6 +264,6 @@ void hashtab_hash_eval(hashtab_t h, char *tag)
} }
printf printf
("%s: %d entries and %d/%d buckets used, longest chain length %d\n", ("%s: %d entries and %zu/%d buckets used, longest chain length %zu\n",
tag, h->nel, slots_used, h->size, max_chain_len); tag, h->nel, slots_used, h->size, max_chain_len);
} }