From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 03/28] Remove local-setxid.h
Date: Wed, 18 Nov 2020 16:55:27 -0300 [thread overview]
Message-ID: <20201118195552.2687336-4-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20201118195552.2687336-1-adhemerval.zanella@linaro.org>
The required Linux specific implementation is moved to internal
posix_spawn implementation.
No semantic changes expected.
---
sysdeps/generic/local-setxid.h | 4 ----
sysdeps/posix/spawni.c | 5 ++---
sysdeps/unix/sysv/linux/local-setxid.h | 16 ----------------
sysdeps/unix/sysv/linux/spawni.c | 19 ++++++++++++++++++-
4 files changed, 20 insertions(+), 24 deletions(-)
delete mode 100644 sysdeps/generic/local-setxid.h
delete mode 100644 sysdeps/unix/sysv/linux/local-setxid.h
diff --git a/sysdeps/generic/local-setxid.h b/sysdeps/generic/local-setxid.h
deleted file mode 100644
index b70d9ffb32..0000000000
--- a/sysdeps/generic/local-setxid.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* No special support. Fall back to the regular functions. */
-
-#define local_seteuid(id) seteuid (id)
-#define local_setegid(id) setegid (id)
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index 943a598771..2dcbc1bf24 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -26,7 +26,6 @@
#include <sys/param.h>
#include <sys/mman.h>
#include <not-cancel.h>
-#include <local-setxid.h>
#include <shlib-compat.h>
#include <nptl/pthreadP.h>
#include <dl-sysdep.h>
@@ -139,8 +138,8 @@ __spawni_child (void *arguments)
/* Set the effective user and group IDs. */
if ((attr->__flags & POSIX_SPAWN_RESETIDS) != 0
- && (local_seteuid (__getuid ()) != 0
- || local_setegid (__getgid ())) != 0)
+ && (__seteuid (__getuid ()) != 0
+ || __setegid (__getgid ())) != 0)
goto fail;
/* Execute the file actions. */
diff --git a/sysdeps/unix/sysv/linux/local-setxid.h b/sysdeps/unix/sysv/linux/local-setxid.h
deleted file mode 100644
index 97d787d942..0000000000
--- a/sysdeps/unix/sysv/linux/local-setxid.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SETxID functions which only have to change the local thread and
- none of the possible other threads. */
-#include <sysdep.h>
-
-#ifdef __NR_setresuid32
-# define local_seteuid(id) INLINE_SYSCALL (setresuid32, 3, -1, id, -1)
-#else
-# define local_seteuid(id) INLINE_SYSCALL (setresuid, 3, -1, id, -1)
-#endif
-
-
-#ifdef __NR_setresgid32
-# define local_setegid(id) INLINE_SYSCALL (setresgid32, 3, -1, id, -1)
-#else
-# define local_setegid(id) INLINE_SYSCALL (setresgid, 3, -1, id, -1)
-#endif
diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c
index f157bfffd2..d8623534cf 100644
--- a/sysdeps/unix/sysv/linux/spawni.c
+++ b/sysdeps/unix/sysv/linux/spawni.c
@@ -25,7 +25,6 @@
#include <sys/param.h>
#include <sys/mman.h>
#include <not-cancel.h>
-#include <local-setxid.h>
#include <shlib-compat.h>
#include <nptl/pthreadP.h>
#include <dl-sysdep.h>
@@ -74,6 +73,24 @@
# define STACK(__stack, __stack_size) (__stack + __stack_size)
#endif
+/* SETxID functions which only have to change the local thread and none of the
+ possible other threads. */
+static int local_seteuid (uid_t euid)
+{
+#ifndef __NR_setresuid32
+# define __NR_setresuid32 __NR_setresuid
+#endif
+ return INLINE_SYSCALL_CALL (setresuid32, -1, euid, -1);
+}
+
+static int local_setegid (uid_t egid)
+{
+#ifndef __NR_setresgid32
+# define __NR_setresgid32 __NR_setresgid
+#endif
+ return INLINE_SYSCALL_CALL (setresgid32, -1, egid, -1);
+}
+
struct posix_spawn_args
{
--
2.25.1
next prev parent reply other threads:[~2020-11-18 19:56 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 19:55 [PATCH 00/28] More Linux syscall refactor Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 01/28] Remove generic pthread linuxism on POSIX timer_routine Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 02/28] Removed ununsed pthread implementations Adhemerval Zanella
2020-11-18 19:55 ` Adhemerval Zanella [this message]
2020-11-18 19:55 ` [PATCH 04/28] Remove HAVE_INLINED_SYSCALLS usage on generic implementations Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 05/28] linux: Consolidate and cleanup personality syscall Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 06/28] x32: Remove syscalls.list Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 07/28] linux: Assume bind support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 08/28] linux: Assume getpeername support Adhemerval Zanella
2020-11-19 12:55 ` Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 09/28] linux: Assume getsockname support Adhemerval Zanella
2020-11-19 12:56 ` Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 10/28] linux: Assume getsockopt support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 11/28] linux: Assume listen support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 12/28] linux: Assume setsockopt support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 13/28] linux: Assume shutdown support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 14/28] linux: Assume socket support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 15/28] linux: Assume socketpair support Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 16/28] linux: Remove superflous __ASSUME_CONNECT_SYSCALL definitions Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 17/28] x86_64: Remove ununsed syscalls.list entry Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 18/28] nptl: Add futex_trylock_pi Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 19/28] linux: Add fanotify_mark C implementation Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 20/28] linux: Add prlimit64 " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 21/28] linux: Implement mremap in C Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 22/28] Linux: implement ioctl " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 23/28] mips: Implement n32 lseek64 " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 24/28] x32: Implement " Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 25/28] linux: Implement pipe in terms of __NR_pipe2 Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 26/28] linux: Consolidate brk implementation Adhemerval Zanella
2020-11-19 17:31 ` Tulio Magno Quites Machado Filho
2020-11-19 17:53 ` Adhemerval Zanella
2020-11-19 20:08 ` Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 27/28] linux: Add generic C syscall implementation Adhemerval Zanella
2020-11-18 19:55 ` [PATCH 28/28] alpha: Move implementations to C Adhemerval Zanella
2020-11-18 21:06 ` [PATCH 00/28] More Linux syscall refactor Joseph Myers
2020-11-19 12:21 ` Adhemerval Zanella
2020-11-19 16:38 ` Joseph Myers
2020-11-19 17:43 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118195552.2687336-4-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).