|
 |
9a4987 |
From 56a29d0e192b119c101146e2197246f51661b6b5 Mon Sep 17 00:00:00 2001
|
|
|
9a4987 |
From: "Dmitry V. Levin" <ldv@altlinux.org>
|
|
|
9a4987 |
Date: Fri, 17 Jul 2020 08:00:00 +0000
|
|
|
9a4987 |
Subject: [PATCH 125/138] printsiginfo: fix printing of siginfo_t.si_pid and
|
|
|
9a4987 |
siginfo_t.si_uid
|
|
|
9a4987 |
|
|
|
9a4987 |
* printsiginfo.c (printsigsource): Print siginfo_t.si_pid using
|
|
|
9a4987 |
PRINT_FIELD_D, print siginfo_t.si_uid using PRINT_FIELD_UID.
|
|
|
9a4987 |
* tests/clone_ptrace.c (main): Update expected output.
|
|
|
9a4987 |
* tests/orphaned_process_group.c (main): Likewise.
|
|
|
9a4987 |
* tests/pidfd_send_signal.c (main): Likewise.
|
|
|
9a4987 |
* tests/ptrace.c (test_peeksiginfo): Likewise.
|
|
|
9a4987 |
* tests/rt_sigqueueinfo.c (main): Likewise.
|
|
|
9a4987 |
* tests/rt_tgsigqueueinfo.c (main): Likewise.
|
|
|
9a4987 |
* tests/siginfo.c (main): Likewise.
|
|
|
9a4987 |
* tests/waitid.c (sprint_siginfo): Likewise.
|
|
|
9a4987 |
---
|
|
|
9a4987 |
printsiginfo.c | 5 ++---
|
|
|
9a4987 |
tests/clone_ptrace.c | 2 +-
|
|
|
9a4987 |
tests/orphaned_process_group.c | 2 +-
|
|
|
9a4987 |
tests/pidfd_send_signal.c | 2 +-
|
|
|
9a4987 |
tests/ptrace.c | 12 ++++++------
|
|
|
9a4987 |
tests/rt_sigqueueinfo.c | 2 +-
|
|
|
9a4987 |
tests/rt_tgsigqueueinfo.c | 4 ++--
|
|
|
9a4987 |
tests/siginfo.c | 10 +++++-----
|
|
|
9a4987 |
tests/waitid.c | 4 ++--
|
|
|
9a4987 |
9 files changed, 21 insertions(+), 22 deletions(-)
|
|
|
9a4987 |
|
|
|
9a4987 |
Index: strace-5.7/printsiginfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/printsiginfo.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/printsiginfo.c 2020-09-09 14:58:30.753017503 +0200
|
|
|
9a4987 |
@@ -58,9 +58,8 @@
|
|
|
9a4987 |
static void
|
|
|
9a4987 |
printsigsource(const siginfo_t *sip)
|
|
|
9a4987 |
{
|
|
|
9a4987 |
- tprintf(", si_pid=%u, si_uid=%u",
|
|
|
9a4987 |
- (unsigned int) sip->si_pid,
|
|
|
9a4987 |
- (unsigned int) sip->si_uid);
|
|
|
9a4987 |
+ PRINT_FIELD_D(", ", *sip, si_pid);
|
|
|
9a4987 |
+ PRINT_FIELD_UID(", ", *sip, si_uid);
|
|
|
9a4987 |
}
|
|
|
9a4987 |
|
|
|
9a4987 |
static void
|
|
|
9a4987 |
Index: strace-5.7/tests/clone_ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/clone_ptrace.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/clone_ptrace.c 2020-09-09 14:58:30.754017504 +0200
|
|
|
9a4987 |
@@ -96,7 +96,7 @@
|
|
|
9a4987 |
error_msg_and_fail("unexpected child exit status %d", status);
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED, si_pid=%d"
|
|
|
9a4987 |
- ", si_uid=%u, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
+ ", si_uid=%d, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
#if !QUIET_EXIT
|
|
|
9a4987 |
"+++ exited with 0 +++\n"
|
|
|
9a4987 |
#endif
|
|
|
9a4987 |
Index: strace-5.7/tests/orphaned_process_group.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/orphaned_process_group.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/orphaned_process_group.c 2020-09-09 14:58:30.754017504 +0200
|
|
|
9a4987 |
@@ -139,7 +139,7 @@
|
|
|
9a4987 |
*/
|
|
|
9a4987 |
leader = getpid();
|
|
|
9a4987 |
printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u} ---\n",
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d} ---\n",
|
|
|
9a4987 |
stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
|
|
|
9a4987 |
printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
|
|
|
9a4987 |
printf("%-5d +++ exited with 0 +++\n", leader);
|
|
|
9a4987 |
Index: strace-5.7/tests/pidfd_send_signal.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/pidfd_send_signal.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/pidfd_send_signal.c 2020-09-09 14:58:30.754017504 +0200
|
|
|
9a4987 |
@@ -54,7 +54,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sys_pidfd_send_signal(fd, SIGUSR2, si, -1);
|
|
|
9a4987 |
printf("pidfd_send_signal(%d, SIGUSR2, {si_signo=SIGUSR1"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=%u, si_pid=%u, si_uid=%u"
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=%u, si_pid=%d, si_uid=%d"
|
|
|
9a4987 |
", si_value={int=%d, ptr=%p}}, %#x) = %s\n",
|
|
|
9a4987 |
fd, si->si_errno, si->si_pid, si->si_uid, si->si_int, si->si_ptr,
|
|
|
9a4987 |
-1U, errstr);
|
|
|
9a4987 |
Index: strace-5.7/tests/ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/ptrace.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/ptrace.c 2020-09-09 14:58:30.754017504 +0200
|
|
|
9a4987 |
@@ -127,16 +127,16 @@
|
|
|
9a4987 |
printf("ptrace(PTRACE_PEEKSIGINFO, %u"
|
|
|
9a4987 |
", {off=%llu, flags=0, nr=%u}"
|
|
|
9a4987 |
", [{si_signo=SIGUSR1, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGUSR2, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGALRM, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
"]) = %s\n",
|
|
|
9a4987 |
(unsigned) pid, psi->off, psi->nr,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
errstr);
|
|
|
9a4987 |
}
|
|
|
9a4987 |
|
|
|
9a4987 |
Index: strace-5.7/tests/rt_sigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/rt_sigqueueinfo.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/rt_sigqueueinfo.c 2020-09-09 14:58:30.754017504 +0200
|
|
|
9a4987 |
@@ -27,7 +27,7 @@
|
|
|
9a4987 |
if (sigqueue(pid, SIGUSR1, value))
|
|
|
9a4987 |
perror_msg_and_skip("sigqueue");
|
|
|
9a4987 |
printf("rt_sigqueueinfo(%u, SIGUSR1, {si_signo=SIGUSR1, "
|
|
|
9a4987 |
- "si_code=SI_QUEUE, si_pid=%u, si_uid=%u, "
|
|
|
9a4987 |
+ "si_code=SI_QUEUE, si_pid=%d, si_uid=%d, "
|
|
|
9a4987 |
"si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
pid, pid, getuid(), value.sival_int, value.sival_ptr);
|
|
|
9a4987 |
printf("+++ exited with 0 +++\n");
|
|
|
9a4987 |
Index: strace-5.7/tests/rt_tgsigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/rt_tgsigqueueinfo.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/rt_tgsigqueueinfo.c 2020-09-09 14:58:30.755017504 +0200
|
|
|
9a4987 |
@@ -53,8 +53,8 @@
|
|
|
9a4987 |
"rt_tgsigqueueinfo");
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("rt_tgsigqueueinfo(%u, %u, %s, {si_signo=%s"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
info->si_pid, info->si_pid, "SIGUSR1", "SIGUSR1",
|
|
|
9a4987 |
info->si_pid, info->si_uid, info->si_value.sival_int,
|
|
|
9a4987 |
info->si_value.sival_ptr);
|
|
|
9a4987 |
Index: strace-5.7/tests/siginfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/siginfo.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/siginfo.c 2020-09-09 14:58:30.755017504 +0200
|
|
|
9a4987 |
@@ -63,7 +63,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=%d"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=%d"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid, sinfo.si_status,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -94,7 +94,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGUSR1"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGUSR1"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -121,7 +121,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_STOPPED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGSTOP"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGSTOP"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -131,7 +131,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_CONTINUED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGCONT"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGCONT"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -142,7 +142,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=0"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=0"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
Index: strace-5.7/tests/waitid.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests/waitid.c 2020-09-09 14:50:44.013739305 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests/waitid.c 2020-09-09 14:58:30.755017504 +0200
|
|
|
9a4987 |
@@ -103,8 +103,8 @@
|
|
|
9a4987 |
snprintf(buf, sizeof(buf),
|
|
|
9a4987 |
"{si_signo=SIGCHLD"
|
|
|
9a4987 |
", si_code=%s"
|
|
|
9a4987 |
- ", si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u"
|
|
|
9a4987 |
+ ", si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d"
|
|
|
9a4987 |
", si_status=%s"
|
|
|
9a4987 |
", si_utime=%llu"
|
|
|
9a4987 |
", si_stime=%llu}",
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/clone_ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/clone_ptrace.c 2020-04-04 00:58:26.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/clone_ptrace.c 2020-09-09 14:59:06.931039067 +0200
|
|
|
9a4987 |
@@ -96,7 +96,7 @@
|
|
|
9a4987 |
error_msg_and_fail("unexpected child exit status %d", status);
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED, si_pid=%d"
|
|
|
9a4987 |
- ", si_uid=%u, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
+ ", si_uid=%d, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
#if !QUIET_EXIT
|
|
|
9a4987 |
"+++ exited with 0 +++\n"
|
|
|
9a4987 |
#endif
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/orphaned_process_group.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/orphaned_process_group.c 2019-03-06 17:02:38.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/orphaned_process_group.c 2020-09-09 14:59:07.012039115 +0200
|
|
|
9a4987 |
@@ -139,7 +139,7 @@
|
|
|
9a4987 |
*/
|
|
|
9a4987 |
leader = getpid();
|
|
|
9a4987 |
printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u} ---\n",
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d} ---\n",
|
|
|
9a4987 |
stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
|
|
|
9a4987 |
printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
|
|
|
9a4987 |
printf("%-5d +++ exited with 0 +++\n", leader);
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/pidfd_send_signal.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/pidfd_send_signal.c 2019-08-14 13:22:32.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/pidfd_send_signal.c 2020-09-09 14:59:07.077039154 +0200
|
|
|
9a4987 |
@@ -54,7 +54,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sys_pidfd_send_signal(fd, SIGUSR2, si, -1);
|
|
|
9a4987 |
printf("pidfd_send_signal(%d, SIGUSR2, {si_signo=SIGUSR1"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=%u, si_pid=%u, si_uid=%u"
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=%u, si_pid=%d, si_uid=%d"
|
|
|
9a4987 |
", si_value={int=%d, ptr=%p}}, %#x) = %s\n",
|
|
|
9a4987 |
fd, si->si_errno, si->si_pid, si->si_uid, si->si_int, si->si_ptr,
|
|
|
9a4987 |
-1U, errstr);
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/ptrace.c 2019-09-25 03:02:03.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/ptrace.c 2020-09-09 14:59:07.142039193 +0200
|
|
|
9a4987 |
@@ -127,16 +127,16 @@
|
|
|
9a4987 |
printf("ptrace(PTRACE_PEEKSIGINFO, %u"
|
|
|
9a4987 |
", {off=%llu, flags=0, nr=%u}"
|
|
|
9a4987 |
", [{si_signo=SIGUSR1, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGUSR2, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGALRM, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
"]) = %s\n",
|
|
|
9a4987 |
(unsigned) pid, psi->off, psi->nr,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
errstr);
|
|
|
9a4987 |
}
|
|
|
9a4987 |
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/rt_sigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/rt_sigqueueinfo.c 2018-12-25 00:46:43.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/rt_sigqueueinfo.c 2020-09-09 14:59:07.204039230 +0200
|
|
|
9a4987 |
@@ -27,7 +27,7 @@
|
|
|
9a4987 |
if (sigqueue(pid, SIGUSR1, value))
|
|
|
9a4987 |
perror_msg_and_skip("sigqueue");
|
|
|
9a4987 |
printf("rt_sigqueueinfo(%u, SIGUSR1, {si_signo=SIGUSR1, "
|
|
|
9a4987 |
- "si_code=SI_QUEUE, si_pid=%u, si_uid=%u, "
|
|
|
9a4987 |
+ "si_code=SI_QUEUE, si_pid=%d, si_uid=%d, "
|
|
|
9a4987 |
"si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
pid, pid, getuid(), value.sival_int, value.sival_ptr);
|
|
|
9a4987 |
printf("+++ exited with 0 +++\n");
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/rt_tgsigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/rt_tgsigqueueinfo.c 2019-09-25 03:02:03.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/rt_tgsigqueueinfo.c 2020-09-09 14:59:07.258039262 +0200
|
|
|
9a4987 |
@@ -53,8 +53,8 @@
|
|
|
9a4987 |
"rt_tgsigqueueinfo");
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("rt_tgsigqueueinfo(%u, %u, %s, {si_signo=%s"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
info->si_pid, info->si_pid, "SIGUSR1", "SIGUSR1",
|
|
|
9a4987 |
info->si_pid, info->si_uid, info->si_value.sival_int,
|
|
|
9a4987 |
info->si_value.sival_ptr);
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/siginfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/siginfo.c 2018-12-25 00:46:43.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/siginfo.c 2020-09-09 14:59:07.311039293 +0200
|
|
|
9a4987 |
@@ -63,7 +63,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=%d"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=%d"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid, sinfo.si_status,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -94,7 +94,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGUSR1"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGUSR1"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -121,7 +121,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_STOPPED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGSTOP"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGSTOP"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -131,7 +131,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_CONTINUED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGCONT"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGCONT"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -142,7 +142,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=0"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=0"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
Index: strace-5.7/tests-m32/waitid.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-m32/waitid.c 2020-04-19 03:22:29.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-m32/waitid.c 2020-09-09 14:59:07.371039329 +0200
|
|
|
9a4987 |
@@ -103,8 +103,8 @@
|
|
|
9a4987 |
snprintf(buf, sizeof(buf),
|
|
|
9a4987 |
"{si_signo=SIGCHLD"
|
|
|
9a4987 |
", si_code=%s"
|
|
|
9a4987 |
- ", si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u"
|
|
|
9a4987 |
+ ", si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d"
|
|
|
9a4987 |
", si_status=%s"
|
|
|
9a4987 |
", si_utime=%llu"
|
|
|
9a4987 |
", si_stime=%llu}",
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/clone_ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/clone_ptrace.c 2020-04-04 00:58:26.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/clone_ptrace.c 2020-09-09 14:59:06.978039095 +0200
|
|
|
9a4987 |
@@ -96,7 +96,7 @@
|
|
|
9a4987 |
error_msg_and_fail("unexpected child exit status %d", status);
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED, si_pid=%d"
|
|
|
9a4987 |
- ", si_uid=%u, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
+ ", si_uid=%d, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
|
|
|
9a4987 |
#if !QUIET_EXIT
|
|
|
9a4987 |
"+++ exited with 0 +++\n"
|
|
|
9a4987 |
#endif
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/orphaned_process_group.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/orphaned_process_group.c 2019-03-06 17:02:38.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/orphaned_process_group.c 2020-09-09 14:59:07.046039135 +0200
|
|
|
9a4987 |
@@ -139,7 +139,7 @@
|
|
|
9a4987 |
*/
|
|
|
9a4987 |
leader = getpid();
|
|
|
9a4987 |
printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u} ---\n",
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d} ---\n",
|
|
|
9a4987 |
stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
|
|
|
9a4987 |
printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
|
|
|
9a4987 |
printf("%-5d +++ exited with 0 +++\n", leader);
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/pidfd_send_signal.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/pidfd_send_signal.c 2019-08-14 13:22:32.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/pidfd_send_signal.c 2020-09-09 14:59:07.110039174 +0200
|
|
|
9a4987 |
@@ -54,7 +54,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sys_pidfd_send_signal(fd, SIGUSR2, si, -1);
|
|
|
9a4987 |
printf("pidfd_send_signal(%d, SIGUSR2, {si_signo=SIGUSR1"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=%u, si_pid=%u, si_uid=%u"
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=%u, si_pid=%d, si_uid=%d"
|
|
|
9a4987 |
", si_value={int=%d, ptr=%p}}, %#x) = %s\n",
|
|
|
9a4987 |
fd, si->si_errno, si->si_pid, si->si_uid, si->si_int, si->si_ptr,
|
|
|
9a4987 |
-1U, errstr);
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/ptrace.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/ptrace.c 2019-09-25 03:02:03.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/ptrace.c 2020-09-09 14:59:07.174039212 +0200
|
|
|
9a4987 |
@@ -127,16 +127,16 @@
|
|
|
9a4987 |
printf("ptrace(PTRACE_PEEKSIGINFO, %u"
|
|
|
9a4987 |
", {off=%llu, flags=0, nr=%u}"
|
|
|
9a4987 |
", [{si_signo=SIGUSR1, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGUSR2, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
", {si_signo=SIGALRM, si_code=SI_TKILL"
|
|
|
9a4987 |
- ", si_pid=%u, si_uid=%u}"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d}"
|
|
|
9a4987 |
"]) = %s\n",
|
|
|
9a4987 |
(unsigned) pid, psi->off, psi->nr,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
- (unsigned) pid, (unsigned) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
+ (int) pid, (int) uid,
|
|
|
9a4987 |
errstr);
|
|
|
9a4987 |
}
|
|
|
9a4987 |
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/rt_sigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/rt_sigqueueinfo.c 2018-12-25 00:46:43.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/rt_sigqueueinfo.c 2020-09-09 14:59:07.232039246 +0200
|
|
|
9a4987 |
@@ -27,7 +27,7 @@
|
|
|
9a4987 |
if (sigqueue(pid, SIGUSR1, value))
|
|
|
9a4987 |
perror_msg_and_skip("sigqueue");
|
|
|
9a4987 |
printf("rt_sigqueueinfo(%u, SIGUSR1, {si_signo=SIGUSR1, "
|
|
|
9a4987 |
- "si_code=SI_QUEUE, si_pid=%u, si_uid=%u, "
|
|
|
9a4987 |
+ "si_code=SI_QUEUE, si_pid=%d, si_uid=%d, "
|
|
|
9a4987 |
"si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
pid, pid, getuid(), value.sival_int, value.sival_ptr);
|
|
|
9a4987 |
printf("+++ exited with 0 +++\n");
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/rt_tgsigqueueinfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/rt_tgsigqueueinfo.c 2019-09-25 03:02:03.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/rt_tgsigqueueinfo.c 2020-09-09 14:59:07.284039277 +0200
|
|
|
9a4987 |
@@ -53,8 +53,8 @@
|
|
|
9a4987 |
"rt_tgsigqueueinfo");
|
|
|
9a4987 |
|
|
|
9a4987 |
printf("rt_tgsigqueueinfo(%u, %u, %s, {si_signo=%s"
|
|
|
9a4987 |
- ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
+ ", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d, si_value={int=%d, ptr=%p}}) = 0\n",
|
|
|
9a4987 |
info->si_pid, info->si_pid, "SIGUSR1", "SIGUSR1",
|
|
|
9a4987 |
info->si_pid, info->si_uid, info->si_value.sival_int,
|
|
|
9a4987 |
info->si_value.sival_ptr);
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/siginfo.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/siginfo.c 2018-12-25 00:46:43.000000000 +0100
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/siginfo.c 2020-09-09 14:59:07.338039310 +0200
|
|
|
9a4987 |
@@ -63,7 +63,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=%d"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=%d"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid, sinfo.si_status,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -94,7 +94,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGUSR1"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGUSR1"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -121,7 +121,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_STOPPED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGSTOP"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGSTOP"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -131,7 +131,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_CONTINUED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=SIGCONT"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=SIGCONT"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
@@ -142,7 +142,7 @@
|
|
|
9a4987 |
|
|
|
9a4987 |
sigsuspend(&unblock_mask);
|
|
|
9a4987 |
tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
|
|
|
9a4987 |
- ", si_pid=%d, si_uid=%u, si_status=0"
|
|
|
9a4987 |
+ ", si_pid=%d, si_uid=%d, si_status=0"
|
|
|
9a4987 |
", si_utime=%llu, si_stime=%llu} ---\n",
|
|
|
9a4987 |
sinfo.si_pid, sinfo.si_uid,
|
|
|
9a4987 |
zero_extend_signed_to_ull(sinfo.si_utime),
|
|
|
9a4987 |
Index: strace-5.7/tests-mx32/waitid.c
|
|
|
9a4987 |
===================================================================
|
|
|
9a4987 |
--- strace-5.7.orig/tests-mx32/waitid.c 2020-04-19 03:22:29.000000000 +0200
|
|
|
9a4987 |
+++ strace-5.7/tests-mx32/waitid.c 2020-09-09 14:59:07.398039345 +0200
|
|
|
9a4987 |
@@ -103,8 +103,8 @@
|
|
|
9a4987 |
snprintf(buf, sizeof(buf),
|
|
|
9a4987 |
"{si_signo=SIGCHLD"
|
|
|
9a4987 |
", si_code=%s"
|
|
|
9a4987 |
- ", si_pid=%u"
|
|
|
9a4987 |
- ", si_uid=%u"
|
|
|
9a4987 |
+ ", si_pid=%d"
|
|
|
9a4987 |
+ ", si_uid=%d"
|
|
|
9a4987 |
", si_status=%s"
|
|
|
9a4987 |
", si_utime=%llu"
|
|
|
9a4987 |
", si_stime=%llu}",
|