From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Cc: Joe Simmons-Talbott <josimmon@redhat.com>
Subject: [PATCH v5 3/3] nptl: Use direct syscall numbers in setxid
Date: Wed, 19 Apr 2023 09:58:21 -0400 [thread overview]
Message-ID: <20230419135821.4113156-4-josimmon@redhat.com> (raw)
In-Reply-To: <20230419135821.4113156-1-josimmon@redhat.com>
Make all internal glibc syscalls use direct compile time numeric values
rather than variables. This will make the syscall number easier to
identify during static analysis.
---
nptl/nptl_setxid.c | 136 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 132 insertions(+), 4 deletions(-)
diff --git a/nptl/nptl_setxid.c b/nptl/nptl_setxid.c
index 4bfcfe4188..797015def1 100644
--- a/nptl/nptl_setxid.c
+++ b/nptl/nptl_setxid.c
@@ -66,8 +66,72 @@ __nptl_setxid_sighandler (int sig, siginfo_t *si, void *ctx)
|| si->si_code != SI_TKILL)
return;
- result = INTERNAL_SYSCALL_NCS (xidcmd->syscall_no, 3, xidcmd->id[0],
- xidcmd->id[1], xidcmd->id[2]);
+ switch(xidcmd->syscall_no)
+ {
+#ifdef __NR_setuid32
+ case __NR_setuid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setuid32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setuid32 */
+ case __NR_setuid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setuid, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#ifdef __NR_setreuid32
+ case __NR_setreuid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setreuid32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setreuid32 */
+ case __NR_setreuid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setreuid, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#ifdef __NR_setresgid32
+ case __NR_setresgid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setresgid32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setresgid32 */
+ case __NR_setresgid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setresgid, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#ifdef __NR_setregid32
+ case __NR_setregid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setregid32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setregid32 */
+ case __NR_setregid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setregid, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#ifdef __NR_setgid32
+ case __NR_setgid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgid32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setgid32 */
+ case __NR_setgid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgid, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#ifdef __NR_setgroups32
+ case __NR_setgroups32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgroups32, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+#endif /* __NR_setgroups32 */
+ case __NR_setgroups:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgroups, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ break;
+ default:
+ result = INTERNAL_SYSCALL_NCS (xidcmd->syscall_no, 3, xidcmd->id[0],
+ xidcmd->id[1], xidcmd->id[2]);
+ }
int error = 0;
if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
error = INTERNAL_SYSCALL_ERRNO (result);
@@ -262,8 +326,72 @@ __nptl_setxid (struct xid_command *cmdp)
/* This must be last, otherwise the current thread might not have
permissions to send SIGSETXID syscall to the other threads. */
- result = INTERNAL_SYSCALL_NCS (cmdp->syscall_no, 3,
- cmdp->id[0], cmdp->id[1], cmdp->id[2]);
+ switch(cmdp->syscall_no)
+ {
+#ifdef __NR_setuid32
+ case __NR_setuid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setuid32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setuid32 */
+ case __NR_setuid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setuid, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#ifdef __NR_setreuid32
+ case __NR_setreuid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setreuid32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setreuid32 */
+ case __NR_setreuid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setreuid, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#ifdef __NR_setresgid32
+ case __NR_setresgid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setresgid32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setresgid32 */
+ case __NR_setresgid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setresgid, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#ifdef __NR_setregid32
+ case __NR_setregid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setregid32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setregid32 */
+ case __NR_setregid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setregid, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#ifdef __NR_setgid32
+ case __NR_setgid32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgid32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setgid32 */
+ case __NR_setgid:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgid, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#ifdef __NR_setgroups32
+ case __NR_setgroups32:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgroups32, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+#endif /* __NR_setgroups32 */
+ case __NR_setgroups:
+ result = INTERNAL_SYSCALL_NCS (__NR_setgroups, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ break;
+ default:
+ result = INTERNAL_SYSCALL_NCS (cmdp->syscall_no, 3, cmdp->id[0],
+ cmdp->id[1], cmdp->id[2]);
+ }
int error = 0;
if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
{
--
2.39.2
prev parent reply other threads:[~2023-04-19 13:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 13:30 [PATCH 0/2] x86_64: aarch64: Set call number just before syscall Joe Simmons-Talbott
2023-04-11 13:30 ` [PATCH 1/2] x86_64: Set the syscall register right before doing the syscall Joe Simmons-Talbott
2023-04-17 22:35 ` Noah Goldstein
2023-04-17 22:36 ` Noah Goldstein
2023-04-11 13:30 ` [PATCH 2/2] aarch64: " Joe Simmons-Talbott
2023-04-11 13:50 ` Florian Weimer
2023-04-11 14:15 ` Adhemerval Zanella Netto
2023-04-11 15:43 ` Szabolcs Nagy
2023-04-11 16:03 ` Florian Weimer
2023-04-11 16:39 ` Adhemerval Zanella Netto
2023-04-12 15:27 ` Joe Simmons-Talbott
2023-04-12 21:11 ` [PATCH v2 0/2] x86_64: aarch64: Set call number just before syscall Joe Simmons-Talbott
2023-04-12 21:11 ` [PATCH v2 1/2] x86_64: Set the syscall register right before doing the syscall Joe Simmons-Talbott
2023-04-12 21:11 ` [PATCH v2 2/2] aarch64: " Joe Simmons-Talbott
2023-04-17 15:34 ` [PATCH v3 0/2] x86_64: aarch64: Set call number just before syscall Joe Simmons-Talbott
2023-04-17 15:34 ` [PATCH v3 1/2] x86_64: Set the syscall register right before doing the syscall Joe Simmons-Talbott
2023-04-17 15:54 ` H.J. Lu
2023-04-17 16:00 ` Joe Simmons-Talbott
2023-04-17 18:38 ` H.J. Lu
2023-04-17 15:34 ` [PATCH v3 2/2] aarch64: " Joe Simmons-Talbott
2023-04-17 21:20 ` [PATCH v4 0/2] x86_64: aarch64: Set call number just before syscall Joe Simmons-Talbott
2023-04-17 21:20 ` [PATCH v4 1/2] x86_64: Set the syscall register right before doing the syscall Joe Simmons-Talbott
2023-04-17 21:20 ` [PATCH v4 2/2] aarch64: " Joe Simmons-Talbott
2023-04-18 12:57 ` Szabolcs Nagy
2023-04-18 19:33 ` Joe Simmons-Talbott
2023-04-19 13:58 ` [PATCH v5 0/3] x86_64: aarch64: Set call number just before syscall Joe Simmons-Talbott
2023-04-19 13:58 ` [PATCH v5 1/3] x86_64: Set the syscall register right before doing the syscall Joe Simmons-Talbott
2023-04-19 15:35 ` H.J. Lu
2023-04-19 15:48 ` Joe Simmons-Talbott
2023-04-19 13:58 ` [PATCH v5 2/3] aarch64: " Joe Simmons-Talbott
2023-04-19 14:56 ` Szabolcs Nagy
2023-04-19 15:21 ` Joe Simmons-Talbott
2023-04-19 13:58 ` Joe Simmons-Talbott [this message]
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=20230419135821.4113156-4-josimmon@redhat.com \
--to=josimmon@redhat.com \
--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).