Skip to contentSkip to conversation

libselinux: Fix integer comparison issues when compiling for 32-bit

PATCH Applied James Carter 3 participants 6 messages Jul 1, 2024 – Jul 30, 2024 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: Fix integer comparison issues when compiling for 32-bit

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

Reported-by Daniel Schepler
---
 libselinux/src/selinux_restorecon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/selinux_restorecon.c +4 -4
index acb729c8..bc6ed935 100644
@@ -1191,8 +1191,8 @@ static int selinux_restorecon_common(const char *pathname_orig,
 	}
 
 	/* Skip digest on in-memory filesystems and /sys */
-	if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
-	    state.sfsb.f_type == SYSFS_MAGIC)
+	if ((uint32_t)state.sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
+		state.sfsb.f_type == TMPFS_MAGIC || state.sfsb.f_type == SYSFS_MAGIC)
 		state.setrestorecondigest = false;
 
 	if (state.flags.set_xdev)
@@ -1490,7 +1490,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
 
 	if (!recurse) {
 		if (statfs(pathname, &sfsb) == 0) {
-			if (sfsb.f_type == RAMFS_MAGIC ||
+			if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
 			    sfsb.f_type == TMPFS_MAGIC)
 				return 0;
 		}
@@ -1525,7 +1525,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
 			continue;
 		case FTS_D:
 			if (statfs(ftsent->fts_path, &sfsb) == 0) {
-				if (sfsb.f_type == RAMFS_MAGIC ||
+				if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
 				    sfsb.f_type == TMPFS_MAGIC)
 					continue;
 			}
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · James Carter

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

LGTM.

Quoted 43 lines
Reported-by Daniel Schepler
---
 libselinux/src/selinux_restorecon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/selinux_restorecon.c +4 -5
index acb729c8..bc6ed935 100644
@@ -1191,8 +1191,8 @@ static int selinux_restorecon_common(const char *pathname_orig,
        }
 
        /* Skip digest on in-memory filesystems and /sys */
-       if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
-           state.sfsb.f_type == SYSFS_MAGIC)
+       if ((uint32_t)state.sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
+               state.sfsb.f_type == TMPFS_MAGIC || state.sfsb.f_type == SYSFS_MAGIC)
                state.setrestorecondigest = false;
 
        if (state.flags.set_xdev)
@@ -1490,7 +1490,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
 
        if (!recurse) {
                if (statfs(pathname, &sfsb) == 0) {
-                       if (sfsb.f_type == RAMFS_MAGIC ||
+                       if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
                            sfsb.f_type == TMPFS_MAGIC)
                                return 0;
                }
@@ -1525,7 +1525,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
                        continue;
                case FTS_D:
                        if (statfs(ftsent->fts_path, &sfsb) == 0) {
-                               if (sfsb.f_type == RAMFS_MAGIC ||
+                               if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
                                    sfsb.f_type == TMPFS_MAGIC)
                                        continue;
                        }
--

2.45.2

maintainer
#2 lore raw
Quoted 9 lines · Christian Göttsche
Quoted 7 lines · James Carter

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Quoted 5 lines
Quoted 2 lines

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

LGTM.

Do you have a reproducer for this? Building with -m32 didn't seem to trigger the error for me on 64-bit Fedora.

#3 lore raw
Quoted 12 lines · Stephen Smalley
Quoted 9 lines · Christian Göttsche
Quoted 7 lines · James Carter

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

LGTM.

Do you have a reproducer for this? Building with -m32 didn't seem to trigger the error for me on 64-bit Fedora.

Building the SELinux userspace with:
DESTDIR=~/local make clean distclean; clear; CPPFLAGS+="-g -m32" DESTDIR=~/local make install install-pywrap
gives me the error.

Jim

maintainer Acked-by on v1 1/1
#4 lore raw
In reply to James Carter
Quoted 7 lines · James Carter

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Quoted 5 lines

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

Reported-by Daniel Schepler
Quoted 41 lines
---
 libselinux/src/selinux_restorecon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/selinux_restorecon.c +4 -5
index acb729c8..bc6ed935 100644
@@ -1191,8 +1191,8 @@ static int selinux_restorecon_common(const char *pathname_orig,
        }
 
        /* Skip digest on in-memory filesystems and /sys */
-       if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
-           state.sfsb.f_type == SYSFS_MAGIC)
+       if ((uint32_t)state.sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
+               state.sfsb.f_type == TMPFS_MAGIC || state.sfsb.f_type == SYSFS_MAGIC)
                state.setrestorecondigest = false;
 
        if (state.flags.set_xdev)
@@ -1490,7 +1490,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
 
        if (!recurse) {
                if (statfs(pathname, &sfsb) == 0) {
-                       if (sfsb.f_type == RAMFS_MAGIC ||
+                       if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
                            sfsb.f_type == TMPFS_MAGIC)
                                return 0;
                }
@@ -1525,7 +1525,7 @@ int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags,
                        continue;
                case FTS_D:
                        if (statfs(ftsent->fts_path, &sfsb) == 0) {
-                               if (sfsb.f_type == RAMFS_MAGIC ||
+                               if ((uint32_t)sfsb.f_type == (uint32_t)RAMFS_MAGIC ||
                                    sfsb.f_type == TMPFS_MAGIC)
                                        continue;
                        }
--

2.45.2

maintainer Applied
#5 lore raw
Quoted 9 lines · Stephen Smalley
Quoted 7 lines · James Carter

Trying to compile libselinux for 32-bit produces the following error:

selinux_restorecon.c:1194:31: error: comparison of integer expressions of different signedness: ‘__fsword_t’ {aka ‘int’} and ‘unsigned int’ [-Werror=sign-compare]
1194 | if (state.sfsb.f_type == RAMFS_MAGIC || state.sfsb.f_type == TMPFS_MAGIC ||
| ^~

Quoted 7 lines
Quoted 5 lines

Since RAMFS_MAGIC = 0x858458f6 == 2240043254, which > 2^31, but < 2^32, cast both as uint32_t for the comparison.

Reported-by Daniel Schepler

Applied.