041eacc63c
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libselinux-3.2..32611aea6543 -- libselinux
Related: rhbz#1938789
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From ae34b3ca3c605f8648b10722330ef3fbc872f3d6 Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
Date: Mon, 3 May 2021 17:10:35 +0200
|
||
Subject: [PATCH] libselinux: sidtab_hash(): do not discard const qualifier
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Do not discard the const qualifier of the function argument, and drop
|
||
the redundant local variable `keyp`.
|
||
|
||
avc_sidtab.c: In function ‘sidtab_hash’:
|
||
avc_sidtab.c:23:9: warning: cast discards ‘const’ qualifier from pointer target type [-Wcast-qual]
|
||
23 | keyp = (char *)key;
|
||
| ^
|
||
|
||
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||
---
|
||
libselinux/src/avc_sidtab.c | 7 +++----
|
||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||
|
||
diff --git a/libselinux/src/avc_sidtab.c b/libselinux/src/avc_sidtab.c
|
||
index 9669264d651a..8dc875608762 100644
|
||
--- a/libselinux/src/avc_sidtab.c
|
||
+++ b/libselinux/src/avc_sidtab.c
|
||
@@ -15,14 +15,13 @@
|
||
|
||
static inline unsigned sidtab_hash(const char * key)
|
||
{
|
||
- char *p, *keyp;
|
||
+ const char *p;
|
||
unsigned int size;
|
||
unsigned int val;
|
||
|
||
val = 0;
|
||
- keyp = (char *)key;
|
||
- size = strlen(keyp);
|
||
- for (p = keyp; (unsigned int)(p - keyp) < size; p++)
|
||
+ size = strlen(key);
|
||
+ for (p = key; (unsigned int)(p - key) < size; p++)
|
||
val =
|
||
(val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^ (*p);
|
||
return val & (SIDTAB_SIZE - 1);
|
||
--
|
||
2.32.0
|
||
|