Skip to contentSkip to conversation

libselinux: do not discard const qualifier

PATCH In review Petr Lautrbach 3 participants 7 messages Apr 27 – May 13 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libselinux: do not discard const qualifier

Fixes:
selinux_config.c: In function ‘selinux_set_policy_root’:
selinux_config.c:284:29: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
284 | char *policy_type = strrchr(path, '/');
| ^~~~~~~
cc1: all warnings being treated as errors

---
 libselinux/src/selinux_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/src/selinux_config.c +1 -1
index e1bc1b79fb10..1e6da288aaeb 100644
@@ -281,7 +281,7 @@ const char *selinux_policy_root(void)
 int selinux_set_policy_root(const char *path)
 {
 	int i;
-	char *policy_type = strrchr(path, '/');
+	const char *policy_type = strrchr(path, '/');
 	if (!policy_type) {
 		errno = EINVAL;
 		return -1;
Signature · 1 line
2.54.0
#1 lore raw

PATCH 2/3 libsemanage: Do not discard ‘const’ qualifier

Fixes build errors like the bellow with glibc-2.43

utilities.c: In function ‘semanage_str_replace’:
utilities.c:248:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
248 | for (p = strstr(src, search); p != NULL; p = strstr(p + slen, search)) {
| ^
utilities.c:265:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
265 | for (p = strstr(src, search); p != NULL; p = strstr(psrc, search)) {
| ^
utilities.c:265:52: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
265 | for (p = strstr(src, search); p != NULL; p = strstr(psrc, search)) {
| ^
utilities.c: In function ‘semanage_basename’:
utilities.c:358:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
358 | char *p = strrchr(filename, '/');
| ^~~~~~~

---
 libsemanage/src/direct_api.c | 2 +-
 libsemanage/src/utilities.c  | 8 ++++----
 libsemanage/src/utilities.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
libsemanage/src/direct_api.c +1 -1
index 8f909a3bbf55..424360a68354 100644
@@ -1755,7 +1755,7 @@ static int semanage_direct_install_file(semanage_handle_t * sh,
 
 	int retval = -1;
 	char *path = NULL;
-	const char *filename;
+	char *filename;
 	const char *lang_ext = NULL;
 	char *module_name = NULL;
 	char *separator;
libsemanage/src/utilities.c +4 -4
index 004ffb627d06..90cc4a3ce990 100644
@@ -234,8 +234,8 @@ char *semanage_str_replace(const char *search, const char *replace,
 			   const char *src, size_t lim)
 {
 	size_t count = 0, slen, rlen, newsize;
-	char *p, *pres, *result;
-	const char *psrc;
+	char *pres, *result;
+	const char *p, *psrc;
 
 	slen = strlen(search);
 	rlen = strlen(replace);
@@ -353,8 +353,8 @@ int write_full(int fd, const void *buf, size_t len)
 #ifdef __GNUC__
 __attribute__((nonnull))
 #endif
-char *semanage_basename(const char *filename)
+const char *semanage_basename(const char *filename)
 {
-	char *p = strrchr(filename, '/');
+	const char *p = strrchr(filename, '/');
 	return p ? p + 1 : (char *)filename;
 }
libsemanage/src/utilities.h +1 -1
index 7481077aaedb..18abc7e628ad 100644
@@ -167,6 +167,6 @@ int write_full(int fd, const void *buf, size_t len) WARN_UNUSED;
 #ifdef __GNUC__
 __attribute__((nonnull))
 #endif
-char *semanage_basename(const char *filename);
+const char *semanage_basename(const char *filename);
 
 #endif
Signature · 1 line
2.54.0
maintainer Acked-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] libsemanage: Do not discard ‘const’ qualifier

Quoted 18 lines · Petr Lautrbach

Fixes build errors like the bellow with glibc-2.43

utilities.c: In function ‘semanage_str_replace’:
utilities.c:248:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
248 | for (p = strstr(src, search); p != NULL; p = strstr(p + slen, search)) {
| ^
utilities.c:265:16: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
265 | for (p = strstr(src, search); p != NULL; p = strstr(psrc, search)) {
| ^
utilities.c:265:52: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
265 | for (p = strstr(src, search); p != NULL; p = strstr(psrc, search)) {
| ^
utilities.c: In function ‘semanage_basename’:
utilities.c:358:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
358 | char *p = strrchr(filename, '/');
| ^~~~~~~

Quoted 1 line
Quoted 61 lines
---
 libsemanage/src/direct_api.c | 2 +-
 libsemanage/src/utilities.c  | 8 ++++----
 libsemanage/src/utilities.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
libsemanage/src/direct_api.c +1 -1
index 8f909a3bbf55..424360a68354 100644
@@ -1755,7 +1755,7 @@ static int semanage_direct_install_file(semanage_handle_t * sh,
 
        int retval = -1;
        char *path = NULL;
-       const char *filename;
+       char *filename;
        const char *lang_ext = NULL;
        char *module_name = NULL;
        char *separator;
libsemanage/src/utilities.c +4 -4
index 004ffb627d06..90cc4a3ce990 100644
@@ -234,8 +234,8 @@ char *semanage_str_replace(const char *search, const char *replace,
                           const char *src, size_t lim)
 {
        size_t count = 0, slen, rlen, newsize;
-       char *p, *pres, *result;
-       const char *psrc;
+       char *pres, *result;
+       const char *p, *psrc;
 
        slen = strlen(search);
        rlen = strlen(replace);
@@ -353,8 +353,8 @@ int write_full(int fd, const void *buf, size_t len)
 #ifdef __GNUC__
 __attribute__((nonnull))
 #endif
-char *semanage_basename(const char *filename)
+const char *semanage_basename(const char *filename)
 {
-       char *p = strrchr(filename, '/');
+       const char *p = strrchr(filename, '/');
        return p ? p + 1 : (char *)filename;
 }
libsemanage/src/utilities.h +1 -2
index 7481077aaedb..18abc7e628ad 100644
@@ -167,6 +167,6 @@ int write_full(int fd, const void *buf, size_t len) WARN_UNUSED;
 #ifdef __GNUC__
 __attribute__((nonnull))
 #endif
-char *semanage_basename(const char *filename);
+const char *semanage_basename(const char *filename);
 
 #endif
--

2.54.0

#3 lore raw

PATCH 3/3 libsemanage: Do not use vfork()

In reply to Petr Lautrbach

Fixes:
semanage_store.c: In function ‘semanage_exec_prog’:
semanage_store.c:1307:16: error: variable ‘a’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
1307 | char **a;
| ^
semanage_store.c:1265:15: error: variable ‘new_s’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
1265 | char *new_s = realloc(s, len + 2);
| ^~~~~
semanage_store.c:1265:15: error: variable ‘new_s’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
cc1: all warnings being treated as errors

---
 libsemanage/src/semanage_store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsemanage/src/semanage_store.c +1 -1
index e3048c08df0e..99d55d9813c9 100644
@@ -1488,7 +1488,7 @@ static int semanage_exec_prog(semanage_handle_t * sh,
 
 	/* no need to use pthread_atfork() -- child will not be using
 	 * any mutexes. */
-	forkval = vfork();
+	forkval = fork();
 	if (forkval == 0) {
 		/* child process.  file descriptors will be closed
 		 * because they were set as close-on-exec. */
Signature · 1 line
2.54.0
maintainer Acked-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] libsemanage: Do not use vfork()

Quoted 12 lines · Petr Lautrbach

Fixes:
semanage_store.c: In function ‘semanage_exec_prog’:
semanage_store.c:1307:16: error: variable ‘a’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
1307 | char **a;
| ^
semanage_store.c:1265:15: error: variable ‘new_s’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
1265 | char *new_s = realloc(s, len + 2);
| ^~~~~
semanage_store.c:1265:15: error: variable ‘new_s’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
cc1: all warnings being treated as errors

Quoted 1 line
Quoted 21 lines
---
 libsemanage/src/semanage_store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsemanage/src/semanage_store.c +1 -2
index e3048c08df0e..99d55d9813c9 100644
@@ -1488,7 +1488,7 @@ static int semanage_exec_prog(semanage_handle_t * sh,
 
        /* no need to use pthread_atfork() -- child will not be using
         * any mutexes. */
-       forkval = vfork();
+       forkval = fork();
        if (forkval == 0) {
                /* child process.  file descriptors will be closed
                 * because they were set as close-on-exec. */
--

2.54.0

maintainer Acked-by on v1 1/3
#5 lore raw
In reply to Petr Lautrbach
Quoted 9 lines · Petr Lautrbach

Fixes:
selinux_config.c: In function ‘selinux_set_policy_root’:
selinux_config.c:284:29: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
284 | char *policy_type = strrchr(path, '/');
| ^~~~~~~
cc1: all warnings being treated as errors

Quoted 21 lines
---
 libselinux/src/selinux_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/src/selinux_config.c +1 -2
index e1bc1b79fb10..1e6da288aaeb 100644
@@ -281,7 +281,7 @@ const char *selinux_policy_root(void)
 int selinux_set_policy_root(const char *path)
 {
        int i;
-       char *policy_type = strrchr(path, '/');
+       const char *policy_type = strrchr(path, '/');
        if (!policy_type) {
                errno = EINVAL;
                return -1;
--

2.54.0

#6 lore raw
Quoted 10 lines · Stephen Smalley
Quoted 8 lines · Petr Lautrbach

Fixes:
selinux_config.c: In function ‘selinux_set_policy_root’:
selinux_config.c:284:29: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
284 | char *policy_type = strrchr(path, '/');
| ^~~~~~~
cc1: all warnings being treated as errors

Quoted 4 lines
Quoted 1 line

These three patches have been merged.
Thanks,
Jim

Quoted 22 lines
Quoted 21 lines
---
 libselinux/src/selinux_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/src/selinux_config.c +1 -2
index e1bc1b79fb10..1e6da288aaeb 100644
@@ -281,7 +281,7 @@ const char *selinux_policy_root(void)
 int selinux_set_policy_root(const char *path)
 {
        int i;
-       char *policy_type = strrchr(path, '/');
+       const char *policy_type = strrchr(path, '/');
        if (!policy_type) {
                errno = EINVAL;
                return -1;
--

2.54.0