92 lines
2.8 KiB
Diff
92 lines
2.8 KiB
Diff
From 0d1445067c67d38e7d5c14155999afb10cc2e1a9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Fri, 14 Jul 2023 20:44:12 +0200
|
|
Subject: [PATCH] hashtab: update
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
libsepol/include/sepol/policydb/hashtab.h | 2 +-
|
|
libsepol/src/hashtab.c | 14 +++++++-------
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/libsepol/include/sepol/policydb/hashtab.h b/libsepol/include/sepol/policydb/hashtab.h
|
|
index 060e8c9c5..3fcd1fdce 100644
|
|
--- a/libsepol/include/sepol/policydb/hashtab.h
|
|
+++ b/libsepol/include/sepol/policydb/hashtab.h
|
|
@@ -108,7 +108,7 @@ extern int hashtab_map(hashtab_t h,
|
|
hashtab_datum_t d,
|
|
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
|
|
}
|
|
diff --git a/libsepol/src/hashtab.c b/libsepol/src/hashtab.c
|
|
index 4a827fd31..b1a9bdc2f 100644
|
|
--- a/libsepol/src/hashtab.c
|
|
+++ b/libsepol/src/hashtab.c
|
|
@@ -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 hvalue;
|
|
+ unsigned int hvalue;
|
|
hashtab_ptr_t prev, cur, newnode;
|
|
|
|
- if (!h)
|
|
+ if (!h || h->nel == UINT32_MAX)
|
|
return SEPOL_ENOMEM;
|
|
|
|
hashtab_check_resize(h);
|
|
@@ -144,7 +144,7 @@ int hashtab_remove(hashtab_t h, hashtab_key_t key,
|
|
void (*destroy) (hashtab_key_t k,
|
|
hashtab_datum_t d, void *args), void *args)
|
|
{
|
|
- int hvalue;
|
|
+ unsigned int hvalue;
|
|
hashtab_ptr_t cur, last;
|
|
|
|
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)
|
|
{
|
|
|
|
- int hvalue;
|
|
+ unsigned int hvalue;
|
|
hashtab_ptr_t cur;
|
|
|
|
if (!h)
|
|
@@ -240,10 +240,10 @@ int hashtab_map(hashtab_t h,
|
|
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;
|
|
- int chain_len, slots_used, max_chain_len;
|
|
+ size_t chain_len, slots_used, max_chain_len;
|
|
hashtab_ptr_t cur;
|
|
|
|
slots_used = 0;
|
|
@@ -264,6 +264,6 @@ void hashtab_hash_eval(hashtab_t h, char *tag)
|
|
}
|
|
|
|
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);
|
|
}
|