nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 05:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: Assume "openat" syscall is used where "open" is unavailable

Browse Source 
On architectures where Linux does not provide the legacy "open" syscall glibc
necessarily uses "openat" instead.  Omit the unnecessary glibc-version check on
these systems.
This commit is contained in:
Simon South 2021-09-06 09:13:40 -04:00
parent b733f9d6ac
commit 1a40f64be1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/sandbox/sandbox.c
View File

@ -505,7 +505,11 @@ is_libc_at_least(int major, int minor)
static int static int
libc_uses_openat_for_open(void) libc_uses_openat_for_open(void)
{ {
#ifdef __NR_open
return is_libc_at_least(2, 26); return is_libc_at_least(2, 26);
#else
return 1;
#endif /* defined(__NR_open) */
} }
/* Return true if we think we're running with a libc that uses openat for the /* Return true if we think we're running with a libc that uses openat for the
@ -513,9 +517,13 @@ libc_uses_openat_for_open(void)
static int static int
libc_uses_openat_for_opendir(void) libc_uses_openat_for_opendir(void)
{ {
#ifdef __NR_open
// libc 2.27 and above or between 2.15 (inclusive) and 2.22 (exclusive) // libc 2.27 and above or between 2.15 (inclusive) and 2.22 (exclusive)
return is_libc_at_least(2, 27) || return is_libc_at_least(2, 27) ||
(is_libc_at_least(2, 15) && !is_libc_at_least(2, 22)); (is_libc_at_least(2, 15) && !is_libc_at_least(2, 22));
#else
return 1;
#endif /* defined(__NR_open) */
} }
/** Allow a single file to be opened. If <b>use_openat</b> is true, /** Allow a single file to be opened. If <b>use_openat</b> is true,