libselinux: Fix integer comparison issues when compiling for 32-bit
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.
--- libselinux/src/selinux_restorecon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
libselinux/src/selinux_restorecon.c +4 -4
@@ -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
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 asuint32_tfor the comparison.
LGTM.
Quoted 43 lines
Reported-by Daniel ScheplerSigned-off-by James Carter <[email protected]>--- libselinux/src/selinux_restorecon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)libselinux/src/selinux_restorecon.c +4
-5@@ -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
Stephen Smalley
maintainerQuoted 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 asuint32_tfor the comparison.LGTM.
Reviewed-by Christian Göttsche <[email protected]>
Do you have a reproducer for this? Building with -m32 didn't seem to trigger the error for me on 64-bit Fedora.
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 asuint32_tfor the comparison.LGTM.
Reviewed-by Christian Göttsche <[email protected]>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
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 asuint32_tfor the comparison.Reported-by Daniel ScheplerSigned-off-by James Carter <[email protected]>
Quoted 41 lines
--- libselinux/src/selinux_restorecon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)libselinux/src/selinux_restorecon.c +4
-5@@ -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
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 asuint32_tfor the comparison.Reported-by Daniel ScheplerSigned-off-by James Carter <[email protected]>Acked-by Stephen Smalley <[email protected]>
Applied.