diff options
| author | Willy Tarreau <w@1wt.eu> | 2021-01-21 08:20:24 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2021-01-21 10:06:44 -0800 |
| commit | 79f220e56dc85739aa5462fa8a1abd4a44f002e0 (patch) | |
| tree | f0342d4748dcff3382d4f063f85842476ddb139b /tools | |
| parent | c261145abd2461f921ac44ad70c28778dda710f4 (diff) | |
| download | linux-stable-79f220e56dc85739aa5462fa8a1abd4a44f002e0.tar.gz linux-stable-79f220e56dc85739aa5462fa8a1abd4a44f002e0.tar.bz2 linux-stable-79f220e56dc85739aa5462fa8a1abd4a44f002e0.zip | |
tools/nolibc: Make dup2() rely on dup3() when available
A recent boot failure on 5.4-rc3 on arm64 revealed that sys_dup2()
is not available and that only sys_dup3() is implemented. This commit
detects this and falls back to sys_dup3() when available. This is a
port of nolibc's upstream commit fd5272ec2c66 to the Linux kernel.
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/nolibc/nolibc.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h index 3115c6467d10..5fda4d844054 100644 --- a/tools/include/nolibc/nolibc.h +++ b/tools/include/nolibc/nolibc.h @@ -1502,10 +1502,22 @@ int sys_dup(int fd) return my_syscall1(__NR_dup, fd); } +#ifdef __NR_dup3 +static __attribute__((unused)) +int sys_dup3(int old, int new, int flags) +{ + return my_syscall3(__NR_dup3, old, new, flags); +} +#endif + static __attribute__((unused)) int sys_dup2(int old, int new) { +#ifdef __NR_dup3 + return my_syscall3(__NR_dup3, old, new, 0); +#else return my_syscall2(__NR_dup2, old, new); +#endif } static __attribute__((unused)) @@ -1876,6 +1888,20 @@ int dup2(int old, int new) return ret; } +#ifdef __NR_dup3 +static __attribute__((unused)) +int dup3(int old, int new, int flags) +{ + int ret = sys_dup3(old, new, flags); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} +#endif + static __attribute__((unused)) int execve(const char *filename, char *const argv[], char *const envp[]) { |