libselinux: restore: use fixed sized integer for hash index

The hash mask is set to 2^16 - 1, which does not fit into a signed 16
bit integer.  Use uint32_t to be on the safe side.  Also use size_t for
counting in debug function.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: Jason Zaman <jason@perfinion.com>
This commit is contained in:
Christian Göttsche 2023-02-01 11:55:10 +01:00 committed by Jason Zaman
parent 06512c4373
commit 1609b9fdfd
1 changed files with 6 additions and 4 deletions

View File

@ -435,7 +435,8 @@ static int filespec_add(ino_t ino, const char *con, const char *file,
const struct rest_flags *flags)
{
file_spec_t *prevfl, *fl;
int h, ret;
uint32_t h;
int ret;
struct stat64 sb;
__pthread_mutex_lock(&fl_mutex);
@ -524,7 +525,8 @@ unlock_1:
static void filespec_eval(void)
{
file_spec_t *fl;
int h, used, nel, len, longest;
uint32_t h;
size_t used, nel, len, longest;
if (!fl_head)
return;
@ -544,7 +546,7 @@ static void filespec_eval(void)
}
selinux_log(SELINUX_INFO,
"filespec hash table stats: %d elements, %d/%d buckets used, longest chain length %d\n",
"filespec hash table stats: %zu elements, %zu/%zu buckets used, longest chain length %zu\n",
nel, used, HASH_BUCKETS, longest);
}
#else
@ -559,7 +561,7 @@ static void filespec_eval(void)
static void filespec_destroy(void)
{
file_spec_t *fl, *tmp;
int h;
uint32_t h;
if (!fl_head)
return;