Make sure futex_time64() is defined before attempting to use it.

It's not present on Debian 8. (Linux 3.16.0, libseccomp 2.2.3)
GerbilSoft · Feb 1, 2025 · b99b902 · b99b902
1 parent 4cac03b
commit b99b902
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/src/gtk/thumbnailer-dbus/rptsecure.c b/src/gtk/thumbnailer-dbus/rptsecure.c
@@ -38,7 +38,10 @@ int rpt_do_security_options(void)
 		SCMP_SYS(fcntl), SCMP_SYS(fcntl64),		// gcc profiling
 		SCMP_SYS(ftruncate),	// LibRpBase::RpFile::truncate() [from LibRpBase::RpPngWriterPrivate ctors]
 		SCMP_SYS(ftruncate64),
-		SCMP_SYS(futex), SCMP_SYS(futex_time64),	// iconv_open(), dlopen()
+		SCMP_SYS(futex),				// iconv_open(), dlopen()
+#if defined(__SNR_futex_time64) || defined(__NR_futex_time64)
+		SCMP_SYS(futex_time64),				// iconv_open(), dlopen()
+#endif /* __SNR_futex_time64 || __NR_futex_time64 */
 		SCMP_SYS(gettimeofday),	// 32-bit only?
 		SCMP_SYS(getppid),	// dll-search.c: walk_proc_tree()
 		SCMP_SYS(getuid),	// TODO: Only use geteuid()?

diff --git a/src/librpbase/tests/gtest_init.cpp b/src/librpbase/tests/gtest_init.cpp
@@ -52,7 +52,10 @@ int RP_C_API _tmain(int argc, TCHAR *argv[])
 		SCMP_SYS(clock_gettime64),
 #endif /* __SNR_clock_gettime64 || __NR_clock_gettime64 */
 		SCMP_SYS(fcntl), SCMP_SYS(fcntl64),		// gcc profiling
-		SCMP_SYS(futex), SCMP_SYS(futex_time64),	// iconv_open()
+		SCMP_SYS(futex),				// iconv_open()
+#if defined(__SNR_futex_time64) || defined(__NR_futex_time64)
+		SCMP_SYS(futex_time64),				// iconv_open()
+#endif /* __SNR_futex_time64 || __NR_futex_time64 */
 		SCMP_SYS(gettimeofday),	// 32-bit only? [testing::internal::GetTimeInMillis()]
 		SCMP_SYS(mmap),		// iconv_open()
 		SCMP_SYS(mmap2),	// iconv_open() [might only be needed on i386...]

diff --git a/src/rp-download/rp-download.cpp b/src/rp-download/rp-download.cpp
@@ -258,7 +258,10 @@ int RP_C_API _tmain(int argc, TCHAR *argv[])
 		SCMP_SYS(close),
 		SCMP_SYS(fcntl),     SCMP_SYS(fcntl64),		// gcc profiling
 		SCMP_SYS(fsetxattr),
-		SCMP_SYS(futex), SCMP_SYS(futex_time64),
+		SCMP_SYS(futex),
+#if defined(__SNR_futex_time64) || defined(__NR_futex_time64)
+		SCMP_SYS(futex_time64)
+#endif /* __SNR_futex_time64 || __NR_futex_time64 */
 		SCMP_SYS(getdents), SCMP_SYS(getdents64),
 		SCMP_SYS(getppid),	// for bubblewrap verification
 		SCMP_SYS(getrusage),

diff --git a/src/rp-stub/rp-stub_secure.c b/src/rp-stub/rp-stub_secure.c
@@ -90,7 +90,10 @@ int rp_stub_do_security_options(bool config)
 		SCMP_SYS(dup),		// gzdopen()
 		SCMP_SYS(ftruncate),	// LibRpBase::RpFile::truncate() [from LibRpBase::RpPngWriterPrivate ctors]
 		SCMP_SYS(ftruncate64),
-		SCMP_SYS(futex), SCMP_SYS(futex_time64),	// pthread_once()
+		SCMP_SYS(futex),				// pthread_once()
+#if defined(__SNR_futex_time64) || defined(__NR_futex_time64)
+		SCMP_SYS(futex_time64),				// pthread_once()
+#endif /* __SNR_futex_time64 || __NR_futex_time64 */
 		SCMP_SYS(getuid), SCMP_SYS(geteuid),		// TODO: Only use geteuid()?
 		SCMP_SYS(lseek), SCMP_SYS(_llseek),
 		SCMP_SYS(lstat), SCMP_SYS(lstat64),		// realpath() [LibRpBase::FileSystem::resolve_symlink()]

diff --git a/src/rpcli/rpcli_secure.c b/src/rpcli/rpcli_secure.c
@@ -38,7 +38,10 @@ int rpcli_do_security_options(void)
 		SCMP_SYS(fcntl),     SCMP_SYS(fcntl64),		// gcc profiling
 		SCMP_SYS(ftruncate),	// LibRpBase::RpFile::truncate() [from LibRpBase::RpPngWriterPrivate ctors]
 		SCMP_SYS(ftruncate64),
-		SCMP_SYS(futex), SCMP_SYS(futex_time64),
+		SCMP_SYS(futex),
+#if defined(__SNR_futex_time64) || defined(__NR_futex_time64)
+		SCMP_SYS(futex_time64),
+#endif /* __SNR_futex_time64 || __NR_futex_time64 */
 		SCMP_SYS(gettimeofday),	// 32-bit only?
 		SCMP_SYS(ioctl),	// for devices; also afl-fuzz
 		SCMP_SYS(lseek), SCMP_SYS(_llseek),