Blame SOURCES/0022-tests-add-kill_child-test.patch

4d44fe
From f5888ee34b2cca8562d2878dbc6b2db9b8256672 Mon Sep 17 00:00:00 2001
4d44fe
From: Eugene Syromyatnikov <evgsyr@gmail.com>
4d44fe
Date: Fri, 1 Feb 2019 11:04:51 +0100
4d44fe
Subject: [PATCH 22/27] tests: add kill_child test
4d44fe
4d44fe
This tests repeatedly creates and kills children, so some corner
4d44fe
cases in handling of not-quite-existing processes can be observed.
4d44fe
4d44fe
Previously, strace was crashing in the following situation:
4d44fe
4d44fe
    13994 ????( <unfinished ...>
4d44fe
    ...
4d44fe
    13994 <... ???? resumed>) = ?
4d44fe
4d44fe
as tcp->s_ent wasn't initialised on syscall entering and
4d44fe
strace.c:print_event_exit segfaulted when tried to access
4d44fe
tcp->s_ent->sys_name.
4d44fe
4d44fe
* tests/kill_child.c: New file.
4d44fe
* tests/kill_child.test: New test.
4d44fe
* tests/.gitignore: Add kill_child.
4d44fe
* tests/Makefile.am (check_PROGRAMS): Likewise.
4d44fe
(MISC_TESTS): Add kill_child.test.
4d44fe
4d44fe
Skipped files (not present in dist tarball):
4d44fe
	tests/.gitignore
4d44fe
4d44fe
Additional changes:
4d44fe
	tests/Makefile.in (auto-generated from tests/Makefile.am)
4d44fe
	tests-m32/Makefile.in (auto-generated from tests-m32/Makefile.am)
4d44fe
	tests-m32/kill_child.c (copy of tests/kill_child.c)
4d44fe
	tests-m32/kill_child.test (copy of tests/kill_child.test)
4d44fe
	tests-m32/Makefile.in (auto-generted from tests-mx32/Makefile.am)
4d44fe
	tests-mx32/kill_child.c (copy of tests/kill_child.c)
4d44fe
	tests-mx32/kill_child.test (copy of tests/kill_child.test)
4d44fe
4d44fe
Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
4d44fe
---
4d44fe
 tests/.gitignore      |  1 +
4d44fe
 tests/Makefile.am     |  2 ++
4d44fe
 tests/kill_child.c    | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
4d44fe
 tests/kill_child.test | 31 +++++++++++++++++++++++
4d44fe
 4 files changed, 103 insertions(+)
4d44fe
 create mode 100644 tests/kill_child.c
4d44fe
 create mode 100755 tests/kill_child.test
4d44fe
4d44fe
Index: strace-4.24/tests/Makefile.am
4d44fe
===================================================================
4d44fe
--- strace-4.24.orig/tests/Makefile.am	2019-03-10 05:34:51.995141191 +0100
4d44fe
+++ strace-4.24/tests/Makefile.am	2019-03-10 05:40:37.969676713 +0100
4d44fe
@@ -104,6 +104,7 @@
4d44fe
 	ioctl_perf-success \
4d44fe
 	ioctl_rtc-v \
4d44fe
 	is_linux_mips_n64 \
4d44fe
+	kill_child \
4d44fe
 	ksysent \
4d44fe
 	list_sigaction_signum \
4d44fe
 	localtime \
4d44fe
@@ -299,6 +300,7 @@
4d44fe
 	get_regs.test \
4d44fe
 	inject-nf.test \
4d44fe
 	interactive_block.test \
4d44fe
+	kill_child.test \
4d44fe
 	ksysent.test \
4d44fe
 	localtime.test \
4d44fe
 	opipe.test \
4d44fe
Index: strace-4.24/tests/kill_child.c
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests/kill_child.c	2019-03-10 05:40:37.970676703 +0100
4d44fe
@@ -0,0 +1,69 @@
4d44fe
+/*
4d44fe
+ * Check for the corner case that previously lead to segfault
4d44fe
+ * due to an attempt to access unitialised tcp->s_ent.
4d44fe
+ *
4d44fe
+ * 13994 ????( <unfinished ...>
4d44fe
+ * ...
4d44fe
+ * 13994 <... ???? resumed>) = ?
4d44fe
+ *
4d44fe
+ * Copyright (c) 2019 The strace developers.
4d44fe
+ * All rights reserved.
4d44fe
+ *
4d44fe
+ * SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+ */
4d44fe
+
4d44fe
+#include "tests.h"
4d44fe
+
4d44fe
+#include <sched.h>
4d44fe
+#include <signal.h>
4d44fe
+#include <unistd.h>
4d44fe
+#include <sys/mman.h>
4d44fe
+#include <sys/wait.h>
4d44fe
+
4d44fe
+#define ITERS    10000
4d44fe
+#define SC_ITERS 10000
4d44fe
+
4d44fe
+int
4d44fe
+main(void)
4d44fe
+{
4d44fe
+	volatile sig_atomic_t *const mem =
4d44fe
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
4d44fe
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
4d44fe
+	if (mem == MAP_FAILED)
4d44fe
+		perror_msg_and_fail("mmap");
4d44fe
+
4d44fe
+	for (unsigned int i = 0; i < ITERS; ++i) {
4d44fe
+		mem[0] = mem[1] = 0;
4d44fe
+
4d44fe
+		const pid_t pid = fork();
4d44fe
+		if (pid < 0)
4d44fe
+			perror_msg_and_fail("fork");
4d44fe
+
4d44fe
+		if (!pid) {
4d44fe
+			/* wait for the parent */
4d44fe
+			while (!mem[0])
4d44fe
+				;
4d44fe
+			/* let the parent know we are running */
4d44fe
+			mem[1] = 1;
4d44fe
+
4d44fe
+			for (unsigned int j = 0; j < SC_ITERS; j++)
4d44fe
+				sched_yield();
4d44fe
+
4d44fe
+			pause();
4d44fe
+			return 0;
4d44fe
+		}
4d44fe
+
4d44fe
+		/* let the child know we are running */
4d44fe
+		mem[0] = 1;
4d44fe
+		/* wait for the child */
4d44fe
+		while (!mem[1])
4d44fe
+			;
4d44fe
+
4d44fe
+		if (kill(pid, SIGKILL))
4d44fe
+			perror_msg_and_fail("kill");
4d44fe
+		if (wait(NULL) != pid)
4d44fe
+			perror_msg_and_fail("wait");
4d44fe
+	}
4d44fe
+
4d44fe
+	return 0;
4d44fe
+}
4d44fe
Index: strace-4.24/tests/kill_child.test
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests/kill_child.test	2019-03-10 05:40:37.970676703 +0100
4d44fe
@@ -0,0 +1,31 @@
4d44fe
+#!/bin/sh
4d44fe
+#
4d44fe
+# Check whether repeated killing of just forked processes crashes strace.
4d44fe
+#
4d44fe
+# Copyright (c) 2019 The strace developers.
4d44fe
+# All rights reserved.
4d44fe
+#
4d44fe
+# SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+
4d44fe
+. "${srcdir=.}/init.sh"
4d44fe
+
4d44fe
+run_prog_skip_if_failed date +%s > /dev/null
4d44fe
+s0="$(date +%s)"
4d44fe
+
4d44fe
+run_prog
4d44fe
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
4d44fe
+
4d44fe
+# Run strace until the known corner case is observed.
4d44fe
+while :; do
4d44fe
+	run_strace $args
4d44fe
+
4d44fe
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
4d44fe
+	# used to segfault when the syscall number had not been obtained
4d44fe
+	# on syscall entering.
4d44fe
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
4d44fe
+
4d44fe
+	s1="$(date +%s)"
4d44fe
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
4d44fe
+		skip_ 'Unable to reproduce <... ???? resumed>'
4d44fe
+	fi
4d44fe
+done
4d44fe
Index: strace-4.24/tests/Makefile.in
4d44fe
===================================================================
4d44fe
--- strace-4.24.orig/tests/Makefile.in	2019-03-10 05:34:51.995141191 +0100
4d44fe
+++ strace-4.24/tests/Makefile.in	2019-03-10 05:40:37.973676673 +0100
4d44fe
@@ -153,8 +153,9 @@
4d44fe
 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
4d44fe
 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
4d44fe
 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
4d44fe
-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
4d44fe
-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
4d44fe
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
4d44fe
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
4d44fe
+	localtime$(EXEEXT) \
4d44fe
 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
4d44fe
 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
4d44fe
 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
4d44fe
@@ -1186,6 +1187,10 @@
4d44fe
 kill_OBJECTS = kill.$(OBJEXT)
4d44fe
 kill_LDADD = $(LDADD)
4d44fe
 kill_DEPENDENCIES = libtests.a
4d44fe
+kill_child_SOURCES = kill_child.c
4d44fe
+kill_child_OBJECTS = kill_child.$(OBJEXT)
4d44fe
+kill_child_LDADD = $(LDADD)
4d44fe
+kill_child_DEPENDENCIES = libtests.a
4d44fe
 ksysent_SOURCES = ksysent.c
4d44fe
 ksysent_OBJECTS = ksysent.$(OBJEXT)
4d44fe
 ksysent_LDADD = $(LDADD)
4d44fe
@@ -2741,9 +2746,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -2886,9 +2891,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -4227,6 +4232,7 @@
4d44fe
 	get_regs.test \
4d44fe
 	inject-nf.test \
4d44fe
 	interactive_block.test \
4d44fe
+	kill_child.test \
4d44fe
 	ksysent.test \
4d44fe
 	localtime.test \
4d44fe
 	opipe.test \
4d44fe
@@ -5190,6 +5196,10 @@
4d44fe
 	@rm -f kill$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
4d44fe
 
4d44fe
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
4d44fe
+	@rm -f kill_child$(EXEEXT)
4d44fe
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
4d44fe
+
4d44fe
 ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
4d44fe
 	@rm -f ksysent$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
4d44fe
@@ -6855,6 +6865,7 @@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
4d44fe
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@
4d44fe
Index: strace-4.24/tests-m32/Makefile.in
4d44fe
===================================================================
4d44fe
--- strace-4.24.orig/tests-m32/Makefile.in	2018-08-14 02:44:38.000000000 +0200
4d44fe
+++ strace-4.24/tests-m32/Makefile.in	2019-03-10 05:44:56.112091757 +0100
4d44fe
@@ -153,8 +153,9 @@
4d44fe
 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
4d44fe
 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
4d44fe
 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
4d44fe
-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
4d44fe
-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
4d44fe
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
4d44fe
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
4d44fe
+	localtime$(EXEEXT) \
4d44fe
 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
4d44fe
 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
4d44fe
 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
4d44fe
@@ -1186,6 +1187,10 @@
4d44fe
 kill_OBJECTS = kill.$(OBJEXT)
4d44fe
 kill_LDADD = $(LDADD)
4d44fe
 kill_DEPENDENCIES = libtests.a
4d44fe
+kill_child_SOURCES = kill_child.c
4d44fe
+kill_child_OBJECTS = kill_child.$(OBJEXT)
4d44fe
+kill_child_LDADD = $(LDADD)
4d44fe
+kill_child_DEPENDENCIES = libtests.a
4d44fe
 ksysent_SOURCES = ksysent.c
4d44fe
 ksysent_OBJECTS = ksysent.$(OBJEXT)
4d44fe
 ksysent_LDADD = $(LDADD)
4d44fe
@@ -2741,9 +2746,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -2886,9 +2891,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -4227,6 +4232,7 @@
4d44fe
 	get_regs.test \
4d44fe
 	inject-nf.test \
4d44fe
 	interactive_block.test \
4d44fe
+	kill_child.test \
4d44fe
 	ksysent.test \
4d44fe
 	localtime.test \
4d44fe
 	opipe.test \
4d44fe
@@ -5190,6 +5196,10 @@
4d44fe
 	@rm -f kill$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
4d44fe
 
4d44fe
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
4d44fe
+	@rm -f kill_child$(EXEEXT)
4d44fe
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
4d44fe
+
4d44fe
 ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
4d44fe
 	@rm -f ksysent$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
4d44fe
@@ -6855,6 +6865,7 @@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
4d44fe
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@
4d44fe
Index: strace-4.24/tests-m32/kill_child.c
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests-m32/kill_child.c	2019-03-10 05:41:09.454361435 +0100
4d44fe
@@ -0,0 +1,69 @@
4d44fe
+/*
4d44fe
+ * Check for the corner case that previously lead to segfault
4d44fe
+ * due to an attempt to access unitialised tcp->s_ent.
4d44fe
+ *
4d44fe
+ * 13994 ????( <unfinished ...>
4d44fe
+ * ...
4d44fe
+ * 13994 <... ???? resumed>) = ?
4d44fe
+ *
4d44fe
+ * Copyright (c) 2019 The strace developers.
4d44fe
+ * All rights reserved.
4d44fe
+ *
4d44fe
+ * SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+ */
4d44fe
+
4d44fe
+#include "tests.h"
4d44fe
+
4d44fe
+#include <sched.h>
4d44fe
+#include <signal.h>
4d44fe
+#include <unistd.h>
4d44fe
+#include <sys/mman.h>
4d44fe
+#include <sys/wait.h>
4d44fe
+
4d44fe
+#define ITERS    10000
4d44fe
+#define SC_ITERS 10000
4d44fe
+
4d44fe
+int
4d44fe
+main(void)
4d44fe
+{
4d44fe
+	volatile sig_atomic_t *const mem =
4d44fe
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
4d44fe
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
4d44fe
+	if (mem == MAP_FAILED)
4d44fe
+		perror_msg_and_fail("mmap");
4d44fe
+
4d44fe
+	for (unsigned int i = 0; i < ITERS; ++i) {
4d44fe
+		mem[0] = mem[1] = 0;
4d44fe
+
4d44fe
+		const pid_t pid = fork();
4d44fe
+		if (pid < 0)
4d44fe
+			perror_msg_and_fail("fork");
4d44fe
+
4d44fe
+		if (!pid) {
4d44fe
+			/* wait for the parent */
4d44fe
+			while (!mem[0])
4d44fe
+				;
4d44fe
+			/* let the parent know we are running */
4d44fe
+			mem[1] = 1;
4d44fe
+
4d44fe
+			for (unsigned int j = 0; j < SC_ITERS; j++)
4d44fe
+				sched_yield();
4d44fe
+
4d44fe
+			pause();
4d44fe
+			return 0;
4d44fe
+		}
4d44fe
+
4d44fe
+		/* let the child know we are running */
4d44fe
+		mem[0] = 1;
4d44fe
+		/* wait for the child */
4d44fe
+		while (!mem[1])
4d44fe
+			;
4d44fe
+
4d44fe
+		if (kill(pid, SIGKILL))
4d44fe
+			perror_msg_and_fail("kill");
4d44fe
+		if (wait(NULL) != pid)
4d44fe
+			perror_msg_and_fail("wait");
4d44fe
+	}
4d44fe
+
4d44fe
+	return 0;
4d44fe
+}
4d44fe
Index: strace-4.24/tests-m32/kill_child.test
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests-m32/kill_child.test	2019-03-10 05:41:25.066205103 +0100
4d44fe
@@ -0,0 +1,31 @@
4d44fe
+#!/bin/sh
4d44fe
+#
4d44fe
+# Check whether repeated killing of just forked processes crashes strace.
4d44fe
+#
4d44fe
+# Copyright (c) 2019 The strace developers.
4d44fe
+# All rights reserved.
4d44fe
+#
4d44fe
+# SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+
4d44fe
+. "${srcdir=.}/init.sh"
4d44fe
+
4d44fe
+run_prog_skip_if_failed date +%s > /dev/null
4d44fe
+s0="$(date +%s)"
4d44fe
+
4d44fe
+run_prog
4d44fe
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
4d44fe
+
4d44fe
+# Run strace until the known corner case is observed.
4d44fe
+while :; do
4d44fe
+	run_strace $args
4d44fe
+
4d44fe
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
4d44fe
+	# used to segfault when the syscall number had not been obtained
4d44fe
+	# on syscall entering.
4d44fe
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
4d44fe
+
4d44fe
+	s1="$(date +%s)"
4d44fe
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
4d44fe
+		skip_ 'Unable to reproduce <... ???? resumed>'
4d44fe
+	fi
4d44fe
+done
4d44fe
Index: strace-4.24/tests-mx32/kill_child.c
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests-mx32/kill_child.c	2019-03-10 05:41:12.566330273 +0100
4d44fe
@@ -0,0 +1,69 @@
4d44fe
+/*
4d44fe
+ * Check for the corner case that previously lead to segfault
4d44fe
+ * due to an attempt to access unitialised tcp->s_ent.
4d44fe
+ *
4d44fe
+ * 13994 ????( <unfinished ...>
4d44fe
+ * ...
4d44fe
+ * 13994 <... ???? resumed>) = ?
4d44fe
+ *
4d44fe
+ * Copyright (c) 2019 The strace developers.
4d44fe
+ * All rights reserved.
4d44fe
+ *
4d44fe
+ * SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+ */
4d44fe
+
4d44fe
+#include "tests.h"
4d44fe
+
4d44fe
+#include <sched.h>
4d44fe
+#include <signal.h>
4d44fe
+#include <unistd.h>
4d44fe
+#include <sys/mman.h>
4d44fe
+#include <sys/wait.h>
4d44fe
+
4d44fe
+#define ITERS    10000
4d44fe
+#define SC_ITERS 10000
4d44fe
+
4d44fe
+int
4d44fe
+main(void)
4d44fe
+{
4d44fe
+	volatile sig_atomic_t *const mem =
4d44fe
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
4d44fe
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
4d44fe
+	if (mem == MAP_FAILED)
4d44fe
+		perror_msg_and_fail("mmap");
4d44fe
+
4d44fe
+	for (unsigned int i = 0; i < ITERS; ++i) {
4d44fe
+		mem[0] = mem[1] = 0;
4d44fe
+
4d44fe
+		const pid_t pid = fork();
4d44fe
+		if (pid < 0)
4d44fe
+			perror_msg_and_fail("fork");
4d44fe
+
4d44fe
+		if (!pid) {
4d44fe
+			/* wait for the parent */
4d44fe
+			while (!mem[0])
4d44fe
+				;
4d44fe
+			/* let the parent know we are running */
4d44fe
+			mem[1] = 1;
4d44fe
+
4d44fe
+			for (unsigned int j = 0; j < SC_ITERS; j++)
4d44fe
+				sched_yield();
4d44fe
+
4d44fe
+			pause();
4d44fe
+			return 0;
4d44fe
+		}
4d44fe
+
4d44fe
+		/* let the child know we are running */
4d44fe
+		mem[0] = 1;
4d44fe
+		/* wait for the child */
4d44fe
+		while (!mem[1])
4d44fe
+			;
4d44fe
+
4d44fe
+		if (kill(pid, SIGKILL))
4d44fe
+			perror_msg_and_fail("kill");
4d44fe
+		if (wait(NULL) != pid)
4d44fe
+			perror_msg_and_fail("wait");
4d44fe
+	}
4d44fe
+
4d44fe
+	return 0;
4d44fe
+}
4d44fe
Index: strace-4.24/tests-mx32/kill_child.test
4d44fe
===================================================================
4d44fe
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
4d44fe
+++ strace-4.24/tests-mx32/kill_child.test	2019-03-10 05:41:27.802177706 +0100
4d44fe
@@ -0,0 +1,31 @@
4d44fe
+#!/bin/sh
4d44fe
+#
4d44fe
+# Check whether repeated killing of just forked processes crashes strace.
4d44fe
+#
4d44fe
+# Copyright (c) 2019 The strace developers.
4d44fe
+# All rights reserved.
4d44fe
+#
4d44fe
+# SPDX-License-Identifier: GPL-2.0-or-later
4d44fe
+
4d44fe
+. "${srcdir=.}/init.sh"
4d44fe
+
4d44fe
+run_prog_skip_if_failed date +%s > /dev/null
4d44fe
+s0="$(date +%s)"
4d44fe
+
4d44fe
+run_prog
4d44fe
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
4d44fe
+
4d44fe
+# Run strace until the known corner case is observed.
4d44fe
+while :; do
4d44fe
+	run_strace $args
4d44fe
+
4d44fe
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
4d44fe
+	# used to segfault when the syscall number had not been obtained
4d44fe
+	# on syscall entering.
4d44fe
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
4d44fe
+
4d44fe
+	s1="$(date +%s)"
4d44fe
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
4d44fe
+		skip_ 'Unable to reproduce <... ???? resumed>'
4d44fe
+	fi
4d44fe
+done
4d44fe
Index: strace-4.24/tests-mx32/Makefile.in
4d44fe
===================================================================
4d44fe
--- strace-4.24.orig/tests-mx32/Makefile.in	2018-08-14 02:44:38.000000000 +0200
4d44fe
+++ strace-4.24/tests-mx32/Makefile.in	2019-03-10 05:45:49.892553217 +0100
4d44fe
@@ -153,8 +153,9 @@
4d44fe
 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
4d44fe
 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
4d44fe
 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
4d44fe
-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
4d44fe
-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
4d44fe
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
4d44fe
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
4d44fe
+	localtime$(EXEEXT) \
4d44fe
 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
4d44fe
 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
4d44fe
 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
4d44fe
@@ -1186,6 +1187,10 @@
4d44fe
 kill_OBJECTS = kill.$(OBJEXT)
4d44fe
 kill_LDADD = $(LDADD)
4d44fe
 kill_DEPENDENCIES = libtests.a
4d44fe
+kill_child_SOURCES = kill_child.c
4d44fe
+kill_child_OBJECTS = kill_child.$(OBJEXT)
4d44fe
+kill_child_LDADD = $(LDADD)
4d44fe
+kill_child_DEPENDENCIES = libtests.a
4d44fe
 ksysent_SOURCES = ksysent.c
4d44fe
 ksysent_OBJECTS = ksysent.$(OBJEXT)
4d44fe
 ksysent_LDADD = $(LDADD)
4d44fe
@@ -2741,9 +2746,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -2886,9 +2891,9 @@
4d44fe
 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
4d44fe
 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
4d44fe
 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
4d44fe
-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
4d44fe
-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
4d44fe
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
4d44fe
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
4d44fe
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
4d44fe
 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
4d44fe
 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
4d44fe
 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
4d44fe
@@ -4227,6 +4232,7 @@
4d44fe
 	get_regs.test \
4d44fe
 	inject-nf.test \
4d44fe
 	interactive_block.test \
4d44fe
+	kill_child.test \
4d44fe
 	ksysent.test \
4d44fe
 	localtime.test \
4d44fe
 	opipe.test \
4d44fe
@@ -5190,6 +5196,10 @@
4d44fe
 	@rm -f kill$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
4d44fe
 
4d44fe
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
4d44fe
+	@rm -f kill_child$(EXEEXT)
4d44fe
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
4d44fe
+
4d44fe
 ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
4d44fe
 	@rm -f ksysent$(EXEEXT)
4d44fe
 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
4d44fe
@@ -6855,6 +6865,7 @@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
4d44fe
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
4d44fe
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@