import strace-4.24-5.el8

2019-11-05 16:29:04 -05:00 · 2019-11-05 16:29:04 -05:00 · 1c9eb26929
parent e99d71d998
commit 1c9eb26929
34 changed files with 33064 additions and 640 deletions
--- a/SOURCES/0001-evdev-fix-decoding-of-bit-sets.patch
+++ b/SOURCES/0001-evdev-fix-decoding-of-bit-sets.patch
@ -0,0 +1,37 @@
+From ba803931948fe89ddf9e3ec407e5e16c689863ad Mon Sep 17 00:00:00 2001
+From: Zhibin Li <08826794brmt@gmail.com>
+Date: Wed, 1 Aug 2018 17:53:57 +0800
+Subject: [PATCH 01/27] evdev: fix decoding of bit sets
+
+According to drivers/input/evdev.c:bits_to_user(),
+the Linux kernel returns the number of bytes, not bits.
+
+* evdev.c (decode_bitset_): Treat syscall return value as the number
+of bytes.
+
+Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
+Fixes: v4.10~89 "Add decoding for evdev ioctls"
+---
+ evdev.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/evdev.c b/evdev.c
+index 7ca15c9..3c1aaa8 100644
+--- a/evdev.c
+++ b/evdev.c
+@@ -171,10 +171,10 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
+ 	tprints(", ");
+ 
+ 	unsigned int size;
+-	if ((kernel_ulong_t) tcp->u_rval > max_nr)
+	if ((kernel_ulong_t) tcp->u_rval > max_nr / 8)
+ 		size = max_nr;
+ 	else
+-		size = tcp->u_rval;
+		size = tcp->u_rval * 8;
+ 	char decoded_arg[size];
+ 
+ 	if (umove_or_printaddr(tcp, arg, &decoded_arg))
+-- 
+2.1.4
+
--- a/SOURCES/0002-evdev-fix-decoding-of-EVIOCGBIT-0.patch
+++ b/SOURCES/0002-evdev-fix-decoding-of-EVIOCGBIT-0.patch
@ -0,0 +1,147 @@
+From c658eb981bfc302aafe5be6e4118a9c0a3f1735e Mon Sep 17 00:00:00 2001
+From: Zhibin Li <08826794brmt@gmail.com>
+Date: Wed, 1 Aug 2018 17:53:57 +0800
+Subject: [PATCH 02/27] evdev: fix decoding of EVIOCGBIT(0, ...)
+
+There is a comment in drivers/input/evdev.c which says:
+/* EV_SYN==0 is EV_CNT, _not_ SYN_CNT, see EVIOCGBIT */
+
+That is, EVIOCGBIT(0, ...) should return a bit mask with supported
+event types instead of SYN_* event codes.
+
+* defs.h (evdev_ev): New prototype.
+* evdev.c: Include "xlat/evdev_ev.h" and remove "xlat/evdev_sync.h".
+(bit_ioctl) <case EV_SYN>: Replace EV_SYN with 0, use evdev_ev
+with XT_SORTED in decode_bitset invocation instead.
+* ioctl.c: Do not include "xlat/evdev_ev.h".
+(evdev_decode_number): Print nr == 0x20 as "0" instead of "EV_SYN".
+* tests/ioctl_evdev.c (main): Use 0 instead of EV_SYN in EVIOCGBIT
+output.
+* xlat/evdev_sync.in: Remove.
+
+Additional changes:
+	xlat/evdev_ev.h (auto-generated from xlat/evdev_ev.in)
+
+Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
+Fixes: v4.10~89 "Add decoding for evdev ioctls"
+---
+ defs.h              | 1 +
+ evdev.c             | 8 ++++----
+ ioctl.c             | 7 ++++---
+ tests/ioctl_evdev.c | 2 +-
+ xlat/evdev_sync.in  | 5 -----
+ 5 files changed, 10 insertions(+), 13 deletions(-)
+ delete mode 100644 xlat/evdev_sync.in
+
+Index: strace-4.24/defs.h
+===================================================================
+--- strace-4.24.orig/defs.h	2019-03-11 12:34:15.719549018 +0100
+++ strace-4.24/defs.h	2019-03-11 12:47:05.976567233 +0100
+@@ -330,6 +330,7 @@
+ /** Number of elements in evdev_abs array without the terminating record. */
+ extern const size_t evdev_abs_size;
+ 
+extern const struct xlat evdev_ev[];
+ extern const struct xlat iffflags[];
+ extern const struct xlat ip_type_of_services[];
+ extern const struct xlat ipc_private[];
+Index: strace-4.24/evdev.c
+===================================================================
+--- strace-4.24.orig/evdev.c	2019-03-11 12:34:21.911484926 +0100
+++ strace-4.24/evdev.c	2019-03-11 12:47:05.976567233 +0100
+@@ -30,6 +30,7 @@
+ #include "defs.h"
+ 
+ #include "xlat/evdev_abs.h"
+#include "xlat/evdev_ev.h"
+ 
+ #ifdef HAVE_LINUX_INPUT_H
+ 
+@@ -47,7 +48,6 @@
+ # include "xlat/evdev_relative_axes.h"
+ # include "xlat/evdev_snd.h"
+ # include "xlat/evdev_switch.h"
+-# include "xlat/evdev_sync.h"
+ 
+ # ifndef SYN_MAX
+ #  define SYN_MAX 0xf
+@@ -258,9 +258,9 @@
+ 	  const kernel_ulong_t arg)
+ {
+ 	switch (ev_nr) {
+-		case EV_SYN:
+-			return decode_bitset(tcp, arg, evdev_sync,
+-					     SYN_MAX, "SYN_???", XT_INDEXED);
+		case 0:
+			return decode_bitset(tcp, arg, evdev_ev,
+					     EV_MAX, "EV_???", XT_SORTED);
+ 		case EV_KEY:
+ 			return decode_bitset(tcp, arg, evdev_keycode,
+ 					     KEY_MAX, "KEY_???", XT_INDEXED);
+Index: strace-4.24/ioctl.c
+===================================================================
+--- strace-4.24.orig/ioctl.c	2019-03-11 12:34:15.719549018 +0100
+++ strace-4.24/ioctl.c	2019-03-11 12:47:05.976567233 +0100
+@@ -33,8 +33,6 @@
+ #include <linux/ioctl.h>
+ #include "xlat/ioctl_dirs.h"
+ 
+-#include "xlat/evdev_ev.h"
+-
+ static int
+ compare(const void *a, const void *b)
+ {
+@@ -99,7 +97,10 @@
+ 
+ 	if (nr >= 0x20 && nr <= 0x20 + 0x1f) {
+ 		tprints("EVIOCGBIT(");
+-		printxval(evdev_ev, nr - 0x20, "EV_???");
+		if (nr == 0x20)
+			tprintf("0");
+		else
+			printxval(evdev_ev, nr - 0x20, "EV_???");
+ 		tprintf(", %u)", _IOC_SIZE(code));
+ 		return 1;
+ 	} else if (nr >= 0x40 && nr <= 0x40 + 0x3f) {
+Index: strace-4.24/tests/ioctl_evdev.c
+===================================================================
+--- strace-4.24.orig/tests/ioctl_evdev.c	2019-03-11 12:34:15.719549018 +0100
+++ strace-4.24/tests/ioctl_evdev.c	2019-03-11 12:47:05.977567222 +0100
+@@ -138,7 +138,7 @@
+ 	TEST_NULL_ARG_EX(EVIOCGABS(0x3f), "EVIOCGABS(0x3f /* ABS_??? */)");
+ 	TEST_NULL_ARG_EX(EVIOCSABS(0x3f), "EVIOCSABS(0x3f /* ABS_??? */)");
+ 
+-	TEST_NULL_ARG(EVIOCGBIT(EV_SYN, 0));
+	TEST_NULL_ARG(EVIOCGBIT(0, 0));
+ 	TEST_NULL_ARG(EVIOCGBIT(EV_KEY, 1));
+ 	TEST_NULL_ARG(EVIOCGBIT(EV_REL, 2));
+ 	TEST_NULL_ARG(EVIOCGBIT(EV_ABS, 3));
+Index: strace-4.24/xlat/evdev_sync.in
+===================================================================
+--- strace-4.24.orig/xlat/evdev_sync.in	2019-03-11 12:34:15.719549018 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,5 +0,0 @@
+-#value_indexed
+-SYN_REPORT	0
+-SYN_CONFIG	1
+-SYN_MT_REPORT	2
+-SYN_DROPPED	3
+Index: strace-4.24/xlat/evdev_ev.h
+===================================================================
+--- strace-4.24.orig/xlat/evdev_ev.h	2018-08-14 02:44:11.000000000 +0200
+++ strace-4.24/xlat/evdev_ev.h	2019-03-11 12:48:32.390670458 +0100
+@@ -90,13 +90,8 @@
+ 
+ #ifndef XLAT_MACROS_ONLY
+ 
+-# ifdef IN_MPERS
+# ifndef IN_MPERS
+ 
+-#  error static const struct xlat evdev_ev in mpers mode
+-
+-# else
+-
+-static
+ const struct xlat evdev_ev[] = {
+  XLAT(EV_SYN),
+  XLAT(EV_KEY),
--- a/SOURCES/0003-xlat-fix-typo-in-smc_protocols.in.patch
+++ b/SOURCES/0003-xlat-fix-typo-in-smc_protocols.in.patch
@ -0,0 +1,52 @@
+From 1422eda187f936e576b17a3e0036b1c1c3476fc4 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Sun, 19 Aug 2018 21:51:15 +0200
+Subject: [PATCH 03/27] xlat: fix typo in smc_protocols.in
+
+* xlat/smc_protocols.in: s/^MCPROTO_SMC/SMCPROTO_SMC/.
+
+Additional changes:
+	Updated aut-generated xlat/smc_protocols.h
+
+---
+ xlat/smc_protocols.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: strace-4.24/xlat/smc_protocols.in
+===================================================================
+--- strace-4.24.orig/xlat/smc_protocols.in	2018-05-08 22:59:20.000000000 +0200
+++ strace-4.24/xlat/smc_protocols.in	2019-03-10 05:08:53.367748788 +0100
+@@ -1,3 +1,3 @@
+ #value_indexed
+-MCPROTO_SMC	0
+SMCPROTO_SMC	0
+ SMCPROTO_SMC6	1
+Index: strace-4.24/xlat/smc_protocols.h
+===================================================================
+--- strace-4.24.orig/xlat/smc_protocols.h	2018-08-14 02:44:23.000000000 +0200
+++ strace-4.24/xlat/smc_protocols.h	2019-03-10 05:09:36.010321779 +0100
+@@ -3,12 +3,12 @@
+ #include "gcc_compat.h"
+ #include "static_assert.h"
+ 
+-#if defined(MCPROTO_SMC) || (defined(HAVE_DECL_MCPROTO_SMC) && HAVE_DECL_MCPROTO_SMC)
+#if defined(SMCPROTO_SMC) || (defined(HAVE_DECL_SMCPROTO_SMC) && HAVE_DECL_SMCPROTO_SMC)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+-static_assert((MCPROTO_SMC) == (0), "MCPROTO_SMC != 0");
+static_assert((SMCPROTO_SMC) == (0), "SMCPROTO_SMC != 0");
+ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+ #else
+-# define MCPROTO_SMC 0
+# define SMCPROTO_SMC 0
+ #endif
+ #if defined(SMCPROTO_SMC6) || (defined(HAVE_DECL_SMCPROTO_SMC6) && HAVE_DECL_SMCPROTO_SMC6)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+@@ -28,7 +28,7 @@
+ 
+ static
+ const struct xlat smc_protocols[] = {
+- [MCPROTO_SMC] = XLAT(MCPROTO_SMC),
+ [SMCPROTO_SMC] = XLAT(SMCPROTO_SMC),
+  [SMCPROTO_SMC6] = XLAT(SMCPROTO_SMC6),
+  XLAT_END
+ };
--- a/SOURCES/strace-rhbz1610774-0000-strace.c-introduce-struct-tcb_wait_data.patch
+++ b/SOURCES/strace-rhbz1610774-0000-strace.c-introduce-struct-tcb_wait_data.patch
@ -1,7 +1,7 @@
-From 14ae61f37b7c4ec236f011ab5c5866b43f6766b4 Mon Sep 17 00:00:00 2001
+From acdd2e8d3d1551b41170a24951addb80b0b0d423 Mon Sep 17 00:00:00 2001
 From: "Dmitry V. Levin" <ldv@altlinux.org>
 Date: Tue, 14 Aug 2018 13:43:34 +0000
-Subject: [PATCH] strace.c: introduce struct tcb_wait_data
+Subject: [PATCH 04/27] strace.c: introduce struct tcb_wait_data

 Introduce a new structure to pass information between next_event(),
 restart_delayed_tcb(), and dispatch_event().
--- a/SOURCES/0005-Document-X-option-in-strace-h-output.patch
+++ b/SOURCES/0005-Document-X-option-in-strace-h-output.patch
@ -0,0 +1,28 @@
+From 57aa6acb769e4a78d769e066411661e2aa053b4b Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 21 Nov 2018 22:51:49 +0000
+Subject: [PATCH 05/27] Document -X option in strace -h output
+
+* strace.c (usage): Mention -X option.
+
+Reported-by: Dmitry Vyukov <dvyukov@google.com>
+Complements: v4.23~308 "Add user interface for configuring xlat output style"
+---
+ strace.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/strace.c b/strace.c
+index 6d70d20..1146339 100644
+--- a/strace.c
+++ b/strace.c
+@@ -272,6 +272,7 @@ Output format:\n\
+   -T             print time spent in each syscall\n\
+   -x             print non-ascii strings in hex\n\
+   -xx            print all strings in hex\n\
+  -X format      set the format for printing of named constants and flags\n\
+   -y             print paths associated with file descriptor arguments\n\
+   -yy            print protocol specific information associated with socket file descriptors\n\
+ \n\
+-- 
+2.1.4
+
--- a/SOURCES/0006-evdev-fix-off-by-one-error-in-decode_bitset.patch
+++ b/SOURCES/0006-evdev-fix-off-by-one-error-in-decode_bitset.patch
@ -0,0 +1,30 @@
+From fdc95e89441ba6f2d39f5f6f3e2ac20933245b8d Mon Sep 17 00:00:00 2001
+From: Eugene Syromiatnikov <esyr@redhat.com>
+Date: Thu, 20 Dec 2018 16:35:27 +0100
+Subject: [PATCH 06/27] evdev: fix off-by-one error in decode_bitset
+
+* evdev.c (decode_bitset): Decrement sorted/indexed xlat's size by one
+in order to account for guarding XLAT_END, as other sorted/indexed xlat
+wrappers do.
+
+Fixes: v4.23~261 "evdev: support various types of xlats in decode_bitset"
+---
+ evdev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/evdev.c b/evdev.c
+index cae2ef1..957d0e2 100644
+--- a/evdev.c
+++ b/evdev.c
+@@ -208,7 +208,7 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
+ 
+ #define decode_bitset(tcp_, arg_, decode_nr_, max_nr_, dflt_, xt_) \
+ 	decode_bitset_((tcp_), (arg_), (decode_nr_), (max_nr_), \
+-		       (dflt_), ARRAY_SIZE(decode_nr_), (xt_))
+		       (dflt_), ARRAY_SIZE(decode_nr_) - 1, (xt_))
+ 
+ # ifdef EVIOCGMTSLOTS
+ static int
+-- 
+2.1.4
+
--- a/SOURCES/0007-nlattr-fix-off-by-one-error-in-indexed-xlat-lookup.patch
+++ b/SOURCES/0007-nlattr-fix-off-by-one-error-in-indexed-xlat-lookup.patch
@ -0,0 +1,29 @@
+From def46773e2540b4898b26c470d8d658b4b39075f Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Sun, 23 Dec 2018 22:12:36 +0000
+Subject: [PATCH 07/27] nlattr: fix off-by-one error in indexed xlat lookup
+
+* nlattr.c (decode_nla_meminfo): Decrement xlat size by one
+to account for XLAT_END as other users of indexed xlats do.
+
+Fixes: v4.23~89 "nlattr: print index names in netlink meminfo array"
+---
+ nlattr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nlattr.c b/nlattr.c
+index af7cc16..db37452 100644
+--- a/nlattr.c
+++ b/nlattr.c
+@@ -217,7 +217,7 @@ decode_nla_meminfo(struct tcb *const tcp,
+ 		       tfetch_mem, print_uint32_array_member, &count,
+ 		       PAF_PRINT_INDICES | PAF_INDEX_XLAT_VALUE_INDEXED
+ 			| XLAT_STYLE_FMT_U,
+-		       ARRSZ_PAIR(netlink_sk_meminfo_indices),
+		       ARRSZ_PAIR(netlink_sk_meminfo_indices) - 1,
+ 		       "SK_MEMINFO_???");
+ 
+ 	return true;
+-- 
+2.1.4
+
--- a/SOURCES/0008-aio-fix-off-by-one-error-in-indexed-xlat-lookup.patch
+++ b/SOURCES/0008-aio-fix-off-by-one-error-in-indexed-xlat-lookup.patch
@ -0,0 +1,29 @@
+From d0035c3031b0d5a1cbb300d698328d118af33d3e Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Sun, 23 Dec 2018 22:12:36 +0000
+Subject: [PATCH 08/27] aio: fix off-by-one error in indexed xlat lookup
+
+* aio.c (tprint_lio_opcode): Decrement xlat size by one to account
+for XLAT_END as other users of indexed xlats do.
+
+Fixes: v4.24~71 "aio: print IOCB_CMD_* using xlat"
+---
+ aio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aio.c b/aio.c
+index a07d8eb..24ad69f 100644
+--- a/aio.c
+++ b/aio.c
+@@ -70,7 +70,7 @@ tprint_lio_opcode(unsigned int cmd)
+ 		[IOCB_CMD_PWRITEV]	= SUB_VECTOR,
+ 	};
+ 
+-	printxval_indexn_ex(ARRSZ_PAIR(aio_cmds), cmd, "IOCB_CMD_???",
+	printxval_indexn_ex(ARRSZ_PAIR(aio_cmds) - 1, cmd, "IOCB_CMD_???",
+ 			    XLAT_STYLE_FMT_U);
+ 
+ 	return cmd < ARRAY_SIZE(subs) ? subs[cmd] : SUB_NONE;
+-- 
+2.1.4
+
--- a/SOURCES/0009-rtnl_link-fix-off-by-one-errors-in-indexed-and-sorte.patch
+++ b/SOURCES/0009-rtnl_link-fix-off-by-one-errors-in-indexed-and-sorte.patch
@ -0,0 +1,94 @@
+From ee037ea1bbe3e9134eab3586bbd54613f39a1693 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Sun, 23 Dec 2018 22:12:36 +0000
+Subject: [PATCH 09/27] rtnl_link: fix off-by-one errors in indexed and sorted
+ xlat lookups
+
+* rtnl_link.c (decode_nla_tun_type, decode_ifla_xdp_attached,
+decode_ifla_inet_conf, decode_ifla_inet6_flags, decode_ifla_inet6_conf,
+decode_ifla_inet6_stats, decode_ifla_inet6_icmp6_stats,
+decode_ifla_inet6_agm): Decrement xlat size by one to account
+for XLAT_END as other users of indexed and sorted xlats do.
+
+Fixes: v4.25~71 "rtnl_link: decode named constants for IFLA_XDP_ATTACHED attribute value"
+Fixes: v4.23~41 "rtnl_link: decode IFLA_AF_SPEC"
+Fixes: v4.23~37 "rtnl_link: implement IFLA_INFO_DATA for tun devices"
+
+Conflicts:
+	rtnl_link.c
+---
+ rtnl_link.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/rtnl_link.c b/rtnl_link.c
+index 1fbfd26..8e02bc7 100644
+--- a/rtnl_link.c
+++ b/rtnl_link.c
+@@ -356,7 +356,7 @@ decode_nla_tun_type(struct tcb *const tcp,
+ {
+ 	const struct decode_nla_xlat_opts opts = {
+ 		.xlat = tun_device_types,
+-		.xlat_size = ARRAY_SIZE(tun_device_types),
+		.xlat_size = ARRAY_SIZE(tun_device_types) - 1,
+ 		.xt = XT_INDEXED,
+ 		.dflt = "IFF_???",
+ 		.size = 1,
+@@ -626,7 +626,8 @@ decode_ifla_inet_conf(struct tcb *const tcp,
+ 	print_array_ex(tcp, addr, cnt, &elem, sizeof(elem),
+ 		       tfetch_mem, print_int32_array_member, NULL,
+ 		       PAF_PRINT_INDICES | PAF_INDEX_XLAT_VALUE_INDEXED
+-			| XLAT_STYLE_FMT_D, ARRSZ_PAIR(inet_devconf_indices),
+			| XLAT_STYLE_FMT_D,
+		       ARRSZ_PAIR(inet_devconf_indices) - 1,
+ 		       "IPV4_DEVCONF_???");
+ 
+ 	return true;
+@@ -643,7 +644,7 @@ decode_ifla_inet6_flags(struct tcb *const tcp,
+ 		        const void *const opaque_data)
+ {
+ 	const struct decode_nla_xlat_opts opts = {
+-		ARRSZ_PAIR(inet6_if_flags), "IF_???",
+		ARRSZ_PAIR(inet6_if_flags) - 1, "IF_???",
+ 		.size = 4,
+ 	};
+ 
+@@ -665,7 +666,8 @@ decode_ifla_inet6_conf(struct tcb *const tcp,
+ 	print_array_ex(tcp, addr, cnt, &elem, sizeof(elem),
+ 		       tfetch_mem, print_int32_array_member, NULL,
+ 		       PAF_PRINT_INDICES | PAF_INDEX_XLAT_VALUE_INDEXED
+-			| XLAT_STYLE_FMT_D, ARRSZ_PAIR(inet6_devconf_indices),
+			| XLAT_STYLE_FMT_D,
+		       ARRSZ_PAIR(inet6_devconf_indices) - 1,
+ 		       "DEVCONF_???");
+ 
+ 	return true;
+@@ -686,7 +688,7 @@ decode_ifla_inet6_stats(struct tcb *const tcp,
+ 	print_array_ex(tcp, addr, cnt, &elem, sizeof(elem),
+ 		       tfetch_mem, print_uint64_array_member, NULL,
+ 		       PAF_PRINT_INDICES | PAF_INDEX_XLAT_VALUE_INDEXED
+-			| XLAT_STYLE_FMT_U, ARRSZ_PAIR(snmp_ip_stats),
+			| XLAT_STYLE_FMT_U, ARRSZ_PAIR(snmp_ip_stats) - 1,
+ 		       "IPSTATS_MIB_???");
+ 
+ 	return true;
+@@ -733,7 +735,7 @@ decode_ifla_inet6_icmp6_stats(struct tcb *const tcp,
+ 	print_array_ex(tcp, addr, cnt, &elem, sizeof(elem),
+ 		       tfetch_mem, print_uint64_array_member, NULL,
+ 		       PAF_PRINT_INDICES | PAF_INDEX_XLAT_VALUE_INDEXED
+-			| XLAT_STYLE_FMT_U, ARRSZ_PAIR(snmp_icmp6_stats),
+			| XLAT_STYLE_FMT_U, ARRSZ_PAIR(snmp_icmp6_stats) - 1,
+ 		       "ICMP6_MIB_???");
+ 
+ 	return true;
+@@ -762,7 +764,7 @@ decode_ifla_inet6_agm(struct tcb *const tcp,
+ 		      const void *const opaque_data)
+ {
+ 	const struct decode_nla_xlat_opts opts = {
+-		ARRSZ_PAIR(in6_addr_gen_mode), "IN6_ADDR_GEN_MODE_???",
+		ARRSZ_PAIR(in6_addr_gen_mode) - 1, "IN6_ADDR_GEN_MODE_???",
+ 		.xt = XT_INDEXED,
+ 		.size = 1,
+ 	};
+-- 
+2.1.4
+
--- a/SOURCES/0010-xlat_idx-do-not-issue-warnings-for-holes-in-indices.patch
+++ b/SOURCES/0010-xlat_idx-do-not-issue-warnings-for-holes-in-indices.patch
@ -0,0 +1,30 @@
+From 1fb452d1a836c69fc9cf7fea59a80a50fabd6385 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Mon, 24 Dec 2018 10:19:24 +0000
+Subject: [PATCH 10/27] xlat_idx: do not issue warnings for holes in indices
+
+Some xlat indices like evdev_abs have holes, avoid issuing warnings
+about them.
+
+* xlat.c (xlat_idx): Do not issue warnings for holes in the index.
+---
+ xlat.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xlat.c b/xlat.c
+index 4614cef..7de51da 100644
+--- a/xlat.c
+++ b/xlat.c
+@@ -269,6 +269,9 @@ xlat_idx(const struct xlat *xlat, size_t nmemb, uint64_t val)
+ 		return NULL;
+ 
+ 	if (val != pos[val].val) {
+		if (pos[val].val == 0)
+			return NULL;	/* a hole in the index */
+
+ 		error_func_msg("Unexpected xlat value %" PRIu64
+ 			       " at index %" PRIu64,
+ 			       pos[val].val, val);
+-- 
+2.1.4
+
--- a/SOURCES/0011-strace.1.in-print-names-of-entities-in-bold-provide-.patch
+++ b/SOURCES/0011-strace.1.in-print-names-of-entities-in-bold-provide-.patch
@ -0,0 +1,403 @@
+From ffc3e46d6ea23ba71eb49c8bc36eb3068968b691 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 4 Sep 2018 16:45:04 +0200
+Subject: [PATCH 11/27] strace.1.in: print names of entities in bold, provide
+ man page sections
+
+* strace.1.in (.SH DESCRIPTION, .SH OPTIONS): Add man page section
+numbers.  Make mentions of strace and other entities bold.
+
+Additional changes:
+	Update auto-generated strace.1
+
+---
+ strace.1.in | 89 ++++++++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 61 insertions(+), 28 deletions(-)
+
+Index: strace-4.24/strace.1.in
+===================================================================
+--- strace-4.24.orig/strace.1.in	2018-07-07 12:29:02.000000000 +0200
+++ strace-4.24/strace.1.in	2019-03-10 05:12:00.665873244 +0100
+@@ -177,7 +177,7 @@
+ open("xyzzy", O_WRONLY|O_APPEND|O_CREAT, 0666) = 3
+ .CE
+ Here, the third argument of
+-.B open
+.BR open (2)
+ is decoded by breaking down the
+ flag argument into its three bitwise-OR constituents and printing the
+ mode value in octal by tradition.  Where the traditional or native
+@@ -198,7 +198,7 @@
+ .B st_mode
+ member is carefully decoded into a bitwise-OR of symbolic and numeric values.
+ Also notice in this example that the first argument to
+-.B lstat
+.BR lstat (2)
+ is an input to the system call and the second argument is an output.
+ Since output arguments are not modified if the system call fails, arguments may
+ not always be dereferenced.  For example, retrying the "ls \-l" example
+@@ -224,15 +224,16 @@
+ (32 by default) bytes of strings are printed;
+ longer strings have an ellipsis appended following the closing quote.
+ Here is a line from "ls \-l" where the
+-.B getpwuid
+.BR getpwuid (3)
+ library routine is reading the password file:
+ .CW
+ read(3, "root::0:0:System Administrator:/"..., 1024) = 422
+ .CE
+ While structures are annotated using curly braces, simple pointers
+ and arrays are printed using square brackets with commas separating
+-elements.  Here is an example from the command "id" on a system with
+-supplementary group ids:
+elements.  Here is an example from the command
+.BR id (1)
+on a system with supplementary group ids:
+ .CW
+ getgroups(32, [100, 0]) = 2
+ .CE
+@@ -489,7 +490,7 @@
+ which is useful to seeing what files the process is referencing.
+ Furthermore, using the abbreviation will ensure that you don't
+ accidentally forget to include a call like
+-.B lstat
+.BR lstat (2)
+ in the list.  Betchya woulda forgot that one.
+ .TP
+ .BR "\-e\ trace" = %process
+@@ -769,8 +770,7 @@
+ \fB\-e\ inject\fR= expression with default value of
+ .I errno
+ option set to
+-.IR ENOSYS .
+-
+.BR ENOSYS .
+ .TP
+ .BR "\-e\ kvm" = vcpu
+ Print the exit reason of kvm vcpu.  Requires Linux kernel version 4.16.0
+@@ -794,10 +794,11 @@
+ .BI "\-b " syscall
+ If specified syscall is reached, detach from traced process.
+ Currently, only
+-.I execve
+.BR execve (2)
+ syscall is supported.  This option is useful if you want to trace
+-multi-threaded process and therefore require -f, but don't want
+-to trace its (potentially very complex) children.
+multi-threaded process and therefore require
+.BR \-f ,
+but don't want to trace its (potentially very complex) children.
+ .TP
+ .B \-D
+ Run tracer process as a detached grandchild, not as parent of the
+@@ -816,16 +817,20 @@
+ .B \-p
+ .I PID
+ .B \-f
+-will attach all threads of process PID if it is multi-threaded,
+-not only thread with thread_id = PID.
+will attach all threads of process
+.I PID
+if it is multi-threaded, not only thread with
+.IR thread_id " = " PID .
+ .TP
+ .B \-ff
+ If the
+ .B \-o
+ .I filename
+ option is in effect, each processes trace is written to
+-.I filename.pid
+-where pid is the numeric process id of each process.
+.IR filename . pid
+where
+.I pid
+is the numeric process id of each process.
+ This is incompatible with
+ .BR \-c ,
+ since no per-process counts are kept.
+@@ -835,11 +840,30 @@
+ to obtain a combined strace log view.
+ .TP
+ .BI "\-I " interruptible
+-When strace can be interrupted by signals (such as pressing ^C).
+-1: no signals are blocked; 2: fatal signals are blocked while decoding syscall
+-(default); 3: fatal signals are always blocked (default if '-o FILE PROG');
+-4: fatal signals and SIGTSTP (^Z) are always blocked (useful to make
+-strace -o FILE PROG not stop on ^Z).
+When
+.B strace
+can be interrupted by signals (such as pressing
+.BR ^C ).
+.RS
+.TP 4
+.B 1
+no signals are blocked;
+.TQ
+.B 2
+fatal signals are blocked while decoding syscall (default);
+.TQ
+.B 3
+fatal signals are always blocked (default if
+.BR -o " " \fIFILE\fR " " \fIPROG\fR );
+.TQ
+.B 4
+fatal signals and
+.BR SIGTSTP " (" ^Z )
+are always blocked (useful to make
+.BI "strace -o " "FILE PROG"
+not stop on
+.BR ^Z ).
+.RE
+ .SS Startup
+ .TP 12
+ \fB\-E\ \fIvar\fR=\,\fIval\fR
+@@ -920,7 +944,8 @@
+ .B strace
+ can be used as a wrapper process transparent to the invoking parent process.
+ Note that parent-child relationship (signal stop notifications,
+-getppid() value, etc) between traced process and its parent are not preserved
+.BR getppid (2)
+value, etc) between traced process and its parent are not preserved
+ unless
+ .B \-D
+ is used.
+@@ -987,8 +1012,11 @@
+ definitions during the build time.
+ Please refer to the output of the
+ .B strace \-V
+-command in order to figure out what support is available in your strace build
+-("non-native" refers to an ABI that differs from the ABI strace has):
+command in order to figure out what support is available in your
+.B strace
+build ("non-native" refers to an ABI that differs from the ABI
+.B strace
+has):
+ .TP 15
+ .B m32-mpers
+ .B strace
+@@ -1057,17 +1085,22 @@
+ .LP
+ On x32, syscalls that are intended to be used by 64-bit processes and not x32
+ ones (for example,
+-.BR readv ,
+.BR readv (2),
+ that has syscall number 19 on x86_64, with its x32 counterpart has syscall
+ number 515), but called with
+ .B __X32_SYSCALL_BIT
+-flag being set, are designated with "#64" suffix.
+flag being set, are designated with
+.B "#64"
+suffix.
+ .LP
+ On some platforms a process that is attached to with the
+ .B \-p
+-option may observe a spurious EINTR return from the current
+-system call that is not restartable.  (Ideally, all system calls
+-should be restarted on strace attach, making the attach invisible
+option may observe a spurious
+.B EINTR
+return from the current system call that is not restartable.
+(Ideally, all system calls should be restarted on
+.B strace
+attach, making the attach invisible
+ to the traced process, but a few system calls aren't.
+ Arguably, every instance of such behavior is a kernel bug.)
+ This may have an unpredictable effect on the process
+Index: strace-4.24/strace.1
+===================================================================
+--- strace-4.24.orig/strace.1	2018-08-14 02:44:59.000000000 +0200
+++ strace-4.24/strace.1	2019-03-10 05:15:15.101926224 +0100
+@@ -53,7 +53,7 @@
+ .  el \
+ .    BR "\\$1"
+ ..
+-.TH STRACE 1 "2018-07-07" "strace 4.24"
+.TH STRACE 1 "2019-03-08" "strace 4.24"
+ .SH NAME
+ strace \- trace system calls and signals
+ .SH SYNOPSIS
+@@ -177,7 +177,7 @@
+ open("xyzzy", O_WRONLY|O_APPEND|O_CREAT, 0666) = 3
+ .CE
+ Here, the third argument of
+-.B open
+.BR open (2)
+ is decoded by breaking down the
+ flag argument into its three bitwise-OR constituents and printing the
+ mode value in octal by tradition.  Where the traditional or native
+@@ -198,7 +198,7 @@
+ .B st_mode
+ member is carefully decoded into a bitwise-OR of symbolic and numeric values.
+ Also notice in this example that the first argument to
+-.B lstat
+.BR lstat (2)
+ is an input to the system call and the second argument is an output.
+ Since output arguments are not modified if the system call fails, arguments may
+ not always be dereferenced.  For example, retrying the "ls \-l" example
+@@ -224,15 +224,16 @@
+ (32 by default) bytes of strings are printed;
+ longer strings have an ellipsis appended following the closing quote.
+ Here is a line from "ls \-l" where the
+-.B getpwuid
+.BR getpwuid (3)
+ library routine is reading the password file:
+ .CW
+ read(3, "root::0:0:System Administrator:/"..., 1024) = 422
+ .CE
+ While structures are annotated using curly braces, simple pointers
+ and arrays are printed using square brackets with commas separating
+-elements.  Here is an example from the command "id" on a system with
+-supplementary group ids:
+elements.  Here is an example from the command
+.BR id (1)
+on a system with supplementary group ids:
+ .CW
+ getgroups(32, [100, 0]) = 2
+ .CE
+@@ -489,7 +490,7 @@
+ which is useful to seeing what files the process is referencing.
+ Furthermore, using the abbreviation will ensure that you don't
+ accidentally forget to include a call like
+-.B lstat
+.BR lstat (2)
+ in the list.  Betchya woulda forgot that one.
+ .TP
+ .BR "\-e\ trace" = %process
+@@ -769,8 +770,7 @@
+ \fB\-e\ inject\fR= expression with default value of
+ .I errno
+ option set to
+-.IR ENOSYS .
+-
+.BR ENOSYS .
+ .TP
+ .BR "\-e\ kvm" = vcpu
+ Print the exit reason of kvm vcpu.  Requires Linux kernel version 4.16.0
+@@ -794,10 +794,11 @@
+ .BI "\-b " syscall
+ If specified syscall is reached, detach from traced process.
+ Currently, only
+-.I execve
+.BR execve (2)
+ syscall is supported.  This option is useful if you want to trace
+-multi-threaded process and therefore require -f, but don't want
+-to trace its (potentially very complex) children.
+multi-threaded process and therefore require
+.BR \-f ,
+but don't want to trace its (potentially very complex) children.
+ .TP
+ .B \-D
+ Run tracer process as a detached grandchild, not as parent of the
+@@ -816,16 +817,20 @@
+ .B \-p
+ .I PID
+ .B \-f
+-will attach all threads of process PID if it is multi-threaded,
+-not only thread with thread_id = PID.
+will attach all threads of process
+.I PID
+if it is multi-threaded, not only thread with
+.IR thread_id " = " PID .
+ .TP
+ .B \-ff
+ If the
+ .B \-o
+ .I filename
+ option is in effect, each processes trace is written to
+-.I filename.pid
+-where pid is the numeric process id of each process.
+.IR filename . pid
+where
+.I pid
+is the numeric process id of each process.
+ This is incompatible with
+ .BR \-c ,
+ since no per-process counts are kept.
+@@ -835,11 +840,30 @@
+ to obtain a combined strace log view.
+ .TP
+ .BI "\-I " interruptible
+-When strace can be interrupted by signals (such as pressing ^C).
+-1: no signals are blocked; 2: fatal signals are blocked while decoding syscall
+-(default); 3: fatal signals are always blocked (default if '-o FILE PROG');
+-4: fatal signals and SIGTSTP (^Z) are always blocked (useful to make
+-strace -o FILE PROG not stop on ^Z).
+When
+.B strace
+can be interrupted by signals (such as pressing
+.BR ^C ).
+.RS
+.TP 4
+.B 1
+no signals are blocked;
+.TQ
+.B 2
+fatal signals are blocked while decoding syscall (default);
+.TQ
+.B 3
+fatal signals are always blocked (default if
+.BR -o " " \fIFILE\fR " " \fIPROG\fR );
+.TQ
+.B 4
+fatal signals and
+.BR SIGTSTP " (" ^Z )
+are always blocked (useful to make
+.BI "strace -o " "FILE PROG"
+not stop on
+.BR ^Z ).
+.RE
+ .SS Startup
+ .TP 12
+ \fB\-E\ \fIvar\fR=\,\fIval\fR
+@@ -920,7 +944,8 @@
+ .B strace
+ can be used as a wrapper process transparent to the invoking parent process.
+ Note that parent-child relationship (signal stop notifications,
+-getppid() value, etc) between traced process and its parent are not preserved
+.BR getppid (2)
+value, etc) between traced process and its parent are not preserved
+ unless
+ .B \-D
+ is used.
+@@ -987,8 +1012,11 @@
+ definitions during the build time.
+ Please refer to the output of the
+ .B strace \-V
+-command in order to figure out what support is available in your strace build
+-("non-native" refers to an ABI that differs from the ABI strace has):
+command in order to figure out what support is available in your
+.B strace
+build ("non-native" refers to an ABI that differs from the ABI
+.B strace
+has):
+ .TP 15
+ .B m32-mpers
+ .B strace
+@@ -1057,17 +1085,22 @@
+ .LP
+ On x32, syscalls that are intended to be used by 64-bit processes and not x32
+ ones (for example,
+-.BR readv ,
+.BR readv (2),
+ that has syscall number 19 on x86_64, with its x32 counterpart has syscall
+ number 515), but called with
+ .B __X32_SYSCALL_BIT
+-flag being set, are designated with "#64" suffix.
+flag being set, are designated with
+.B "#64"
+suffix.
+ .LP
+ On some platforms a process that is attached to with the
+ .B \-p
+-option may observe a spurious EINTR return from the current
+-system call that is not restartable.  (Ideally, all system calls
+-should be restarted on strace attach, making the attach invisible
+option may observe a spurious
+.B EINTR
+return from the current system call that is not restartable.
+(Ideally, all system calls should be restarted on
+.B strace
+attach, making the attach invisible
+ to the traced process, but a few system calls aren't.
+ Arguably, every instance of such behavior is a kernel bug.)
+ This may have an unpredictable effect on the process
--- a/SOURCES/0012-strace.1.in-consistently-use-CTRL-combinations.patch
+++ b/SOURCES/0012-strace.1.in-consistently-use-CTRL-combinations.patch
@ -0,0 +1,110 @@
+From be720dc56adad1ecac99476cc302fec1d1ba8ee8 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 4 Sep 2018 20:30:30 +0200
+Subject: [PATCH 12/27] strace.1.in: consistently use CTRL-combinations
+
+Additional changes:
+	Updated auto-generated strace.1
+
+---
+ strace.1.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+Index: strace-4.24/strace.1.in
+===================================================================
+--- strace-4.24.orig/strace.1.in	2019-03-10 05:12:00.665873244 +0100
+++ strace-4.24/strace.1.in	2019-03-10 05:17:19.205683488 +0100
+@@ -843,7 +843,7 @@
+ When
+ .B strace
+ can be interrupted by signals (such as pressing
+-.BR ^C ).
+.BR CTRL\-C ).
+ .RS
+ .TP 4
+ .B 1
+@@ -858,11 +858,11 @@
+ .TQ
+ .B 4
+ fatal signals and
+-.BR SIGTSTP " (" ^Z )
+.BR SIGTSTP " (" CTRL\-Z )
+ are always blocked (useful to make
+ .BI "strace -o " "FILE PROG"
+ not stop on
+-.BR ^Z ).
+.BR CTRL\-Z ).
+ .RE
+ .SS Startup
+ .TP 12
+@@ -883,8 +883,8 @@
+ .I pid
+ and begin tracing.
+ The trace may be terminated
+-at any time by a keyboard interrupt signal (\c
+-.SM CTRL\s0-C).
+at any time by a keyboard interrupt signal
+.RB ( CTRL\-C ).
+ .B strace
+ will respond by detaching itself from the traced process(es)
+ leaving it (them) to continue running.
+@@ -1129,8 +1129,8 @@
+ .LP
+ Traced processes which are descended from
+ .I command
+-may be left running after an interrupt signal (\c
+-.SM CTRL\s0-C).
+may be left running after an interrupt signal
+.RB ( CTRL\-C ).
+ .SH HISTORY
+ The original
+ .B strace
+Index: strace-4.24/strace.1
+===================================================================
+--- strace-4.24.orig/strace.1	2019-03-10 05:18:07.824196638 +0100
+++ strace-4.24/strace.1	2019-03-10 05:18:36.534909138 +0100
+@@ -843,7 +843,7 @@
+ When
+ .B strace
+ can be interrupted by signals (such as pressing
+-.BR ^C ).
+.BR CTRL\-C ).
+ .RS
+ .TP 4
+ .B 1
+@@ -858,11 +858,11 @@
+ .TQ
+ .B 4
+ fatal signals and
+-.BR SIGTSTP " (" ^Z )
+.BR SIGTSTP " (" CTRL\-Z )
+ are always blocked (useful to make
+ .BI "strace -o " "FILE PROG"
+ not stop on
+-.BR ^Z ).
+.BR CTRL\-Z ).
+ .RE
+ .SS Startup
+ .TP 12
+@@ -883,8 +883,8 @@
+ .I pid
+ and begin tracing.
+ The trace may be terminated
+-at any time by a keyboard interrupt signal (\c
+-.SM CTRL\s0-C).
+at any time by a keyboard interrupt signal
+.RB ( CTRL\-C ).
+ .B strace
+ will respond by detaching itself from the traced process(es)
+ leaving it (them) to continue running.
+@@ -1129,8 +1129,8 @@
+ .LP
+ Traced processes which are descended from
+ .I command
+-may be left running after an interrupt signal (\c
+-.SM CTRL\s0-C).
+may be left running after an interrupt signal
+.RB ( CTRL\-C ).
+ .SH HISTORY
+ The original
+ .B strace
--- a/SOURCES/0013-tests-change-the-license-to-GPL-2.0-or-later.patch
+++ b/SOURCES/0013-tests-change-the-license-to-GPL-2.0-or-later.patch
--- a/SOURCES/0014-Change-the-license-of-strace-to-LGPL-2.1-or-later.patch
+++ b/SOURCES/0014-Change-the-license-of-strace-to-LGPL-2.1-or-later.patch
--- a/SOURCES/0015-tests-use-tail_alloc-instead-of-calloc-in-bpf-obj_ge.patch
+++ b/SOURCES/0015-tests-use-tail_alloc-instead-of-calloc-in-bpf-obj_ge.patch
@ -0,0 +1,216 @@
+From 14e5342e996ff122875a2306ba8d84dac096a48a Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Thu, 3 Jan 2019 23:36:22 +0000
+Subject: [PATCH 15/27] tests: use tail_alloc instead of calloc in
+ bpf-obj_get_info_by_fd-prog*
+
+This guarantees that map_info and prog_info objects are not accessed
+out of bounds.
+
+* tests/bpf-obj_get_info_by_fd.c: Include <string.h>.
+(main): Use tail_alloc instead of calloc for map_info and prog_info.
+
+Conflicts:
+	tests/bpf-obj_get_info_by_fd.c
+
+Additional changes:
+	tests-m32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
+	tests-mx32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
+
+---
+ tests/bpf-obj_get_info_by_fd.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: strace-4.24/tests/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests/bpf-obj_get_info_by_fd.c	2019-03-10 05:19:26.164412164 +0100
+++ strace-4.24/tests/bpf-obj_get_info_by_fd.c	2019-03-10 05:35:03.618024803 +0100
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+#include <string.h>
+ #include <unistd.h>
+ #include <sys/sysmacros.h>
+ #include <asm/unistd.h>
+@@ -274,13 +275,14 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  MAP_INFO_SZ (sizeof(*map_info) + 64)
+-	struct bpf_map_info_struct *map_info = calloc(1, MAP_INFO_SZ);
+	struct bpf_map_info_struct *map_info = tail_alloc(MAP_INFO_SZ);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_map_get_info_attr = {
+ 		.bpf_fd   = map_fd,
+ 		.info_len = MAP_INFO_SZ,
+ 		.info     = (uintptr_t) map_info,
+ 	};
+ 
+	memset(map_info, 0, MAP_INFO_SZ);
+ 	int ret = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &bpf_map_get_info_attr,
+ 			  sizeof(bpf_map_get_info_attr));
+ 	if (ret < 0)
+@@ -330,7 +332,7 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  PROG_INFO_SZ (sizeof(*prog_info) + 64)
+-	struct bpf_prog_info_struct *prog_info = calloc(1, PROG_INFO_SZ);
+	struct bpf_prog_info_struct *prog_info = tail_alloc(PROG_INFO_SZ);
+ 	struct bpf_insn *xlated_prog = tail_alloc(sizeof(*xlated_prog) * 42);
+ 	uint32_t *map_ids = tail_alloc(sizeof(*map_ids) * 2);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_prog_get_info_attr = {
+@@ -340,6 +342,7 @@
+ 	};
+ 	size_t old_prog_info_len = PROG_INFO_SZ;
+ 
+	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+ 		switch (i) {
+Index: strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests-m32/bpf-obj_get_info_by_fd.c	2018-06-04 03:11:05.000000000 +0200
+++ strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c	2019-03-10 05:35:43.934621086 +0100
+@@ -4,27 +4,7 @@
+  * Copyright (c) 2018 The strace developers.
+  * All rights reserved.
+  *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- *    derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+  */
+ 
+ #include "tests.h"
+@@ -38,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+#include <string.h>
+ #include <unistd.h>
+ #include <sys/sysmacros.h>
+ #include <asm/unistd.h>
+@@ -294,13 +275,14 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  MAP_INFO_SZ (sizeof(*map_info) + 64)
+-	struct bpf_map_info_struct *map_info = calloc(1, MAP_INFO_SZ);
+	struct bpf_map_info_struct *map_info = tail_alloc(MAP_INFO_SZ);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_map_get_info_attr = {
+ 		.bpf_fd   = map_fd,
+ 		.info_len = MAP_INFO_SZ,
+ 		.info     = (uintptr_t) map_info,
+ 	};
+ 
+	memset(map_info, 0, MAP_INFO_SZ);
+ 	int ret = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &bpf_map_get_info_attr,
+ 			  sizeof(bpf_map_get_info_attr));
+ 	if (ret < 0)
+@@ -350,7 +332,7 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  PROG_INFO_SZ (sizeof(*prog_info) + 64)
+-	struct bpf_prog_info_struct *prog_info = calloc(1, PROG_INFO_SZ);
+	struct bpf_prog_info_struct *prog_info = tail_alloc(PROG_INFO_SZ);
+ 	struct bpf_insn *xlated_prog = tail_alloc(sizeof(*xlated_prog) * 42);
+ 	uint32_t *map_ids = tail_alloc(sizeof(*map_ids) * 2);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_prog_get_info_attr = {
+@@ -360,6 +342,7 @@
+ 	};
+ 	size_t old_prog_info_len = PROG_INFO_SZ;
+ 
+	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+ 		switch (i) {
+Index: strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests-mx32/bpf-obj_get_info_by_fd.c	2018-06-04 03:11:05.000000000 +0200
+++ strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c	2019-03-10 05:35:48.837571989 +0100
+@@ -4,27 +4,7 @@
+  * Copyright (c) 2018 The strace developers.
+  * All rights reserved.
+  *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- *    derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+  */
+ 
+ #include "tests.h"
+@@ -38,6 +18,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+#include <string.h>
+ #include <unistd.h>
+ #include <sys/sysmacros.h>
+ #include <asm/unistd.h>
+@@ -294,13 +275,14 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  MAP_INFO_SZ (sizeof(*map_info) + 64)
+-	struct bpf_map_info_struct *map_info = calloc(1, MAP_INFO_SZ);
+	struct bpf_map_info_struct *map_info = tail_alloc(MAP_INFO_SZ);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_map_get_info_attr = {
+ 		.bpf_fd   = map_fd,
+ 		.info_len = MAP_INFO_SZ,
+ 		.info     = (uintptr_t) map_info,
+ 	};
+ 
+	memset(map_info, 0, MAP_INFO_SZ);
+ 	int ret = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &bpf_map_get_info_attr,
+ 			  sizeof(bpf_map_get_info_attr));
+ 	if (ret < 0)
+@@ -350,7 +332,7 @@
+ 	 * initializer element is not constant.
+ 	 */
+ 	#define  PROG_INFO_SZ (sizeof(*prog_info) + 64)
+-	struct bpf_prog_info_struct *prog_info = calloc(1, PROG_INFO_SZ);
+	struct bpf_prog_info_struct *prog_info = tail_alloc(PROG_INFO_SZ);
+ 	struct bpf_insn *xlated_prog = tail_alloc(sizeof(*xlated_prog) * 42);
+ 	uint32_t *map_ids = tail_alloc(sizeof(*map_ids) * 2);
+ 	struct BPF_OBJ_GET_INFO_BY_FD_struct bpf_prog_get_info_attr = {
+@@ -360,6 +342,7 @@
+ 	};
+ 	size_t old_prog_info_len = PROG_INFO_SZ;
+ 
+	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+ 		switch (i) {
--- a/SOURCES/0016-tests-fix-prog_info-initialization-in-bpf-obj_get_in.patch
+++ b/SOURCES/0016-tests-fix-prog_info-initialization-in-bpf-obj_get_in.patch
@ -0,0 +1,61 @@
+From 755e4a0da3035c128d18c9a8f7d2f61f29715323 Mon Sep 17 00:00:00 2001
+From: Martin Lau <kafai@fb.com>
+Date: Thu, 3 Jan 2019 23:36:22 +0000
+Subject: [PATCH 16/27] tests: fix prog_info initialization in
+ bpf-obj_get_info_by_fd-prog*
+
+The sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &bpf_prog_get_info_attr, ...) is
+called in a loop.  The bpf_prog_get_info_attr.info object is in size 104
+but bpf_prog_get_info_attr.info_len is in size 168.  Hence, if the prog
+is jited, the second iteration onwards will have nr_jited_ksyms == 1
+which is asking the kernel to fill the
+bpf_prog_get_info_attr.info.jited_ksyms and it is NULL.
+
+* tests/bpf-obj_get_info_by_fd.c (main): Clear memory beyond prog_info
+at the start of every iteration.
+
+Additional changes:
+	tests-m32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
+	tests-mx32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
+
+Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
+---
+ tests/bpf-obj_get_info_by_fd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: strace-4.24/tests/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests/bpf-obj_get_info_by_fd.c	2019-03-10 05:38:07.889179571 +0100
+++ strace-4.24/tests/bpf-obj_get_info_by_fd.c	2019-03-10 05:38:16.038097970 +0100
+@@ -345,6 +345,7 @@
+ 	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+		memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
+ 		switch (i) {
+ 		case 1:
+ 			prog_info->xlated_prog_insns =
+Index: strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests-m32/bpf-obj_get_info_by_fd.c	2019-03-10 05:35:43.934621086 +0100
+++ strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c	2019-03-10 05:38:32.161936511 +0100
+@@ -345,6 +345,7 @@
+ 	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+		memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
+ 		switch (i) {
+ 		case 1:
+ 			prog_info->xlated_prog_insns =
+Index: strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c
+===================================================================
+--- strace-4.24.orig/tests-mx32/bpf-obj_get_info_by_fd.c	2019-03-10 05:38:12.854129853 +0100
+++ strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c	2019-03-10 05:38:29.561962546 +0100
+@@ -345,6 +345,7 @@
+ 	memset(prog_info, 0, PROG_INFO_SZ);
+ 	for (unsigned int i = 0; i < 4; i++) {
+ 		prog_info->jited_prog_len = 0;
+		memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
+ 		switch (i) {
+ 		case 1:
+ 			prog_info->xlated_prog_insns =
--- a/SOURCES/0017-Merge-.-resumed-printing.patch
+++ b/SOURCES/0017-Merge-.-resumed-printing.patch
@ -0,0 +1,211 @@
+From 8967985c6fedf1b0545f81d48c5c232718eb47d2 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 29 Jan 2019 13:54:23 +0100
+Subject: [PATCH 17/27] Merge "<... resumed>" printing
+
+Apparently, it was slightly different with no apparent reason.
+Use a single routine to print this message now.
+
+* defs.h (print_syscall_resume): New function declaration.
+* strace.c (print_event_exit): Replace open-coding of "<... resumed>"
+message printing with a print_syscall_resume() call.
+* syscall.c (syscall_exiting_trace): Likewise.
+(print_syscall_resume): New function.
+* tests/threads-execve.c: Update expected output.
+
+Additional changes:
+	tests-m32/threads-execve.c (copy of tests/threads-execve.c)
+	tests-mx32/threads-execve.c (copy of tests/threads-execve.c)
+
+---
+ defs.h                 |  2 ++
+ strace.c               |  7 +------
+ syscall.c              | 35 +++++++++++++++++++++--------------
+ tests/threads-execve.c |  2 +-
+ 4 files changed, 25 insertions(+), 21 deletions(-)
+
+Index: strace-4.24/defs.h
+===================================================================
+--- strace-4.24.orig/defs.h	2019-03-10 05:34:58.570075352 +0100
+++ strace-4.24/defs.h	2019-03-10 05:39:18.611471380 +0100
+@@ -408,6 +408,8 @@
+ extern void set_overhead(int);
+ extern void print_pc(struct tcb *);
+ 
+extern void print_syscall_resume(struct tcb *tcp);
+
+ extern int syscall_entering_decode(struct tcb *);
+ extern int syscall_entering_trace(struct tcb *, unsigned int *);
+ extern void syscall_entering_finish(struct tcb *, int);
+Index: strace-4.24/strace.c
+===================================================================
+--- strace-4.24.orig/strace.c	2019-03-10 05:34:58.570075352 +0100
+++ strace-4.24/strace.c	2019-03-10 05:39:18.612471370 +0100
+@@ -2191,12 +2191,7 @@
+ 		set_current_tcp(tcp);
+ 	}
+ 
+-	if ((followfork < 2 && printing_tcp != tcp)
+-	    || (tcp->flags & TCB_REPRINT)) {
+-		tcp->flags &= ~TCB_REPRINT;
+-		printleader(tcp);
+-		tprintf("<... %s resumed>", tcp->s_ent->sys_name);
+-	}
+	print_syscall_resume(tcp);
+ 
+ 	if (!(tcp->sys_func_rval & RVAL_DECODED)) {
+ 		/*
+Index: strace-4.24/syscall.c
+===================================================================
+--- strace-4.24.orig/syscall.c	2019-03-10 05:34:58.570075352 +0100
+++ strace-4.24/syscall.c	2019-03-10 05:39:18.613471360 +0100
+@@ -722,19 +722,9 @@
+ 	return get_syscall_result(tcp);
+ }
+ 
+-int
+-syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res)
+void
+print_syscall_resume(struct tcb *tcp)
+ {
+-	if (syscall_tampered(tcp) || inject_delay_exit(tcp))
+-		tamper_with_syscall_exiting(tcp);
+-
+-	if (cflag) {
+-		count_syscall(tcp, ts);
+-		if (cflag == CFLAG_ONLY_STATS) {
+-			return 0;
+-		}
+-	}
+-
+ 	/* If not in -ff mode, and printing_tcp != tcp,
+ 	 * then the log currently does not end with output
+ 	 * of _our syscall entry_, but with something else.
+@@ -744,11 +734,28 @@
+ 	 * "strace -ff -oLOG test/threaded_execve" corner case.
+ 	 * It's the only case when -ff mode needs reprinting.
+ 	 */
+-	if ((followfork < 2 && printing_tcp != tcp) || (tcp->flags & TCB_REPRINT)) {
+	if ((followfork < 2 && printing_tcp != tcp)
+	    || (tcp->flags & TCB_REPRINT)) {
+ 		tcp->flags &= ~TCB_REPRINT;
+ 		printleader(tcp);
+-		tprintf("<... %s resumed> ", tcp->s_ent->sys_name);
+		tprintf("<... %s resumed>", tcp->s_ent->sys_name);
+ 	}
+}
+
+int
+syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res)
+{
+	if (syscall_tampered(tcp) || inject_delay_exit(tcp))
+		tamper_with_syscall_exiting(tcp);
+
+	if (cflag) {
+		count_syscall(tcp, ts);
+		if (cflag == CFLAG_ONLY_STATS) {
+			return 0;
+		}
+	}
+
+	print_syscall_resume(tcp);
+ 	printing_tcp = tcp;
+ 
+ 	tcp->s_prev_ent = NULL;
+Index: strace-4.24/tests/threads-execve.c
+===================================================================
+--- strace-4.24.orig/tests/threads-execve.c	2019-03-10 05:34:58.570075352 +0100
+++ strace-4.24/tests/threads-execve.c	2019-03-10 05:39:18.613471360 +0100
+@@ -141,7 +141,7 @@
+ 	}
+ 
+ 	printf("%-5d +++ superseded by execve in pid %u +++\n"
+-	       "%-5d <... execve resumed> ) = 0\n",
+	       "%-5d <... execve resumed>) = 0\n",
+ 	       leader, tid,
+ 	       leader);
+ 
+Index: strace-4.24/tests-m32/threads-execve.c
+===================================================================
+--- strace-4.24.orig/tests-m32/threads-execve.c	2017-05-22 19:33:51.000000000 +0200
+++ strace-4.24/tests-m32/threads-execve.c	2019-03-10 05:39:41.348243702 +0100
+@@ -5,27 +5,7 @@
+  * Copyright (c) 2016-2017 The strace developers.
+  * All rights reserved.
+  *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- *    derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+  */
+ 
+ #include "tests.h"
+@@ -161,7 +141,7 @@
+ 	}
+ 
+ 	printf("%-5d +++ superseded by execve in pid %u +++\n"
+-	       "%-5d <... execve resumed> ) = 0\n",
+	       "%-5d <... execve resumed>) = 0\n",
+ 	       leader, tid,
+ 	       leader);
+ 
+Index: strace-4.24/tests-mx32/threads-execve.c
+===================================================================
+--- strace-4.24.orig/tests-mx32/threads-execve.c	2017-05-22 19:33:51.000000000 +0200
+++ strace-4.24/tests-mx32/threads-execve.c	2019-03-10 05:39:43.817218978 +0100
+@@ -5,27 +5,7 @@
+  * Copyright (c) 2016-2017 The strace developers.
+  * All rights reserved.
+  *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in the
+- *    documentation and/or other materials provided with the distribution.
+- * 3. The name of the author may not be used to endorse or promote products
+- *    derived from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+  */
+ 
+ #include "tests.h"
+@@ -161,7 +141,7 @@
+ 	}
+ 
+ 	printf("%-5d +++ superseded by execve in pid %u +++\n"
+-	       "%-5d <... execve resumed> ) = 0\n",
+	       "%-5d <... execve resumed>) = 0\n",
+ 	       leader, tid,
+ 	       leader);
+ 
--- a/SOURCES/0018-Use-accessors-for-tcp-s_ent-return-a-stub-struct-if-.patch
+++ b/SOURCES/0018-Use-accessors-for-tcp-s_ent-return-a-stub-struct-if-.patch
@ -0,0 +1,513 @@
+From 25e40facc12017de2c4df5792f6a0a3f7db39896 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 29 Jan 2019 14:40:11 +0100
+Subject: [PATCH 18/27] Use accessors for tcp->s_ent, return a stub struct if
+ it is NULL
+
+Since code paths are non-trivial, it's an attempt to future-proof
+and prevent improper access of tcp->s_ent fields.
+
+* defs.h (struct tcb): Update the description of s_ent field.
+(stub_sysent): New declaration.
+(tcp_sysent, n_args): New macro functions.
+(indirect_ipccall): Use tcp_sysent() instead of tcp->s_ent.
+* ipc.c (SYS_FUNC(ipc)): Use n_args() instead of tcp->s_ent->nargs.
+* linux/alpha/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/bfin/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/hppa/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/ia64/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/microblaze/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/mips/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/sh/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/sh64/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/x86_64/get_syscall_args.c (get_syscall_args): Likewise.
+* linux/xtensa/get_syscall_args.c (get_syscall_args): Likewise.
+* prctl.c (print_prctl_args): Likewise.
+* signal.c (SYS_FUNC(sgetmask)): Likewise.
+* util.c (printargs, printargs_u, printargs_d): Likewise.
+* syscall.c (decode_ipc_subcall, decode_syscall_subcall: Likewise.
+(dumpio, tamper_with_syscall_exiting, syscall_entering_decode,
+syscall_entering_decode, syscall_entering_trace, syscall_entering_trace,
+syscall_exiting_decode, print_syscall_resume, syscall_exiting_trace,
+get_syscall_result): Use tcp_sysent() instead of tcp->s_ent.
+(stub_sysent): New stub sysent.
+(get_scno): Reset scno, s_ent, qual_flg; initialise s->ent from
+stub_sysent.
+* pathtrace.c (pathtrace_match_set): Use tcp_sysent() instead of
+tcp->s_ent.
+
+Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
+
+Conflicts:
+	defs.h
+	linux/mips/get_syscall_args.c
+	syscall.c
+---
+ defs.h                              | 10 ++++++--
+ ipc.c                               |  2 +-
+ linux/alpha/get_syscall_args.c      |  2 +-
+ linux/bfin/get_syscall_args.c       |  2 +-
+ linux/hppa/get_syscall_args.c       |  2 +-
+ linux/ia64/get_syscall_args.c       |  2 +-
+ linux/microblaze/get_syscall_args.c |  2 +-
+ linux/mips/get_syscall_args.c       |  6 ++---
+ linux/sh/get_syscall_args.c         |  2 +-
+ linux/sh64/get_syscall_args.c       |  2 +-
+ linux/x86_64/get_syscall_args.c     |  2 +-
+ linux/xtensa/get_syscall_args.c     |  2 +-
+ pathtrace.c                         |  2 +-
+ prctl.c                             |  2 +-
+ signal.c                            |  4 +--
+ syscall.c                           | 49 +++++++++++++++++++++----------------
+ util.c                              |  6 ++---
+ 17 files changed, 56 insertions(+), 43 deletions(-)
+
+diff --git a/defs.h b/defs.h
+index c7274c8..811bb0d 100644
+--- a/defs.h
+++ b/defs.h
+@@ -206,7 +206,9 @@ struct tcb {
+ 	const char *auxstr;	/* Auxiliary info from syscall (see RVAL_STR) */
+ 	void *_priv_data;	/* Private data for syscall decoding functions */
+ 	void (*_free_priv_data)(void *); /* Callback for freeing priv_data */
+-	const struct_sysent *s_ent; /* sysent[scno] or dummy struct for bad scno */
+	const struct_sysent *s_ent; /* sysent[scno] or a stub struct for bad
+				     * scno.  Use tcp_sysent() macro for access.
+				     */
+ 	const struct_sysent *s_prev_ent; /* for "resuming interrupted SYSCALL" msg */
+ 	struct inject_opts *inject_vec[SUPPORTED_PERSONALITIES];
+ 	struct timespec stime;	/* System time usage as of last process wait */
+@@ -283,6 +285,10 @@ struct tcb {
+ #define syscall_delayed(tcp)	((tcp)->flags & TCB_DELAYED)
+ #define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL)
+ 
+extern const struct_sysent stub_sysent;
+#define tcp_sysent(tcp) (tcp->s_ent ?: &stub_sysent)
+#define n_args(tcp) (tcp_sysent(tcp)->nargs)
+
+ #include "xlat.h"
+ 
+ extern const struct xlat addrfams[];
+@@ -352,7 +358,7 @@ extern const struct xlat whence_codes[];
+ #define IOCTL_NUMBER_HANDLED 1
+ #define IOCTL_NUMBER_STOP_LOOKUP 010
+ 
+-#define indirect_ipccall(tcp) (tcp->s_ent->sys_flags & TRACE_INDIRECT_SUBCALL)
+#define indirect_ipccall(tcp) (tcp_sysent(tcp)->sys_flags & TRACE_INDIRECT_SUBCALL)
+ 
+ enum sock_proto {
+ 	SOCK_PROTO_UNKNOWN,
+diff --git a/ipc.c b/ipc.c
+index c35509b..b2b3aa4 100644
+--- a/ipc.c
+++ b/ipc.c
+@@ -21,7 +21,7 @@ SYS_FUNC(ipc)
+ 	printxval_u(ipccalls, call, NULL);
+ 
+ 	unsigned int i;
+-	for (i = 1; i < tcp->s_ent->nargs; ++i)
+	for (i = 1; i < n_args(tcp); ++i)
+ 		tprintf(", %#" PRI_klx, tcp->u_arg[i]);
+ 
+ 	return RVAL_DECODED;
+diff --git a/linux/alpha/get_syscall_args.c b/linux/alpha/get_syscall_args.c
+index be61abf..c28eb62 100644
+--- a/linux/alpha/get_syscall_args.c
+++ b/linux/alpha/get_syscall_args.c
+@@ -4,7 +4,7 @@ get_syscall_args(struct tcb *tcp)
+ {
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, REG_A0+i, &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/linux/bfin/get_syscall_args.c b/linux/bfin/get_syscall_args.c
+index 506d3a9..bebaf03 100644
+--- a/linux/bfin/get_syscall_args.c
+++ b/linux/bfin/get_syscall_args.c
+@@ -7,7 +7,7 @@ get_syscall_args(struct tcb *tcp)
+ 	};
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, argreg[i], &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/linux/hppa/get_syscall_args.c b/linux/hppa/get_syscall_args.c
+index aa938f5..70f2a24 100644
+--- a/linux/hppa/get_syscall_args.c
+++ b/linux/hppa/get_syscall_args.c
+@@ -4,7 +4,7 @@ get_syscall_args(struct tcb *tcp)
+ {
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, PT_GR26-4*i, &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/linux/ia64/get_syscall_args.c b/linux/ia64/get_syscall_args.c
+index ad73c54..eeeb59c 100644
+--- a/linux/ia64/get_syscall_args.c
+++ b/linux/ia64/get_syscall_args.c
+@@ -11,7 +11,7 @@ get_syscall_args(struct tcb *tcp)
+ 	unsigned long *out0 = ia64_rse_skip_regs(rbs_end, -sof + sol);
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i) {
+	for (i = 0; i < n_args(tcp); ++i) {
+ 		if (umove(tcp,
+ 			  (unsigned long) ia64_rse_skip_regs(out0, i),
+ 			  &tcp->u_arg[i]) < 0) {
+diff --git a/linux/microblaze/get_syscall_args.c b/linux/microblaze/get_syscall_args.c
+index 1a3a48f..0e249e3 100644
+--- a/linux/microblaze/get_syscall_args.c
+++ b/linux/microblaze/get_syscall_args.c
+@@ -4,7 +4,7 @@ get_syscall_args(struct tcb *tcp)
+ {
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, (5 + i) * 4, &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/linux/mips/get_syscall_args.c b/linux/mips/get_syscall_args.c
+index 3c9160e..0ff5136 100644
+--- a/linux/mips/get_syscall_args.c
+++ b/linux/mips/get_syscall_args.c
+@@ -14,16 +14,16 @@ get_syscall_args(struct tcb *tcp)
+ 	tcp->u_arg[1] = mips_REG_A1;
+ 	tcp->u_arg[2] = mips_REG_A2;
+ 	tcp->u_arg[3] = mips_REG_A3;
+-	if (tcp->s_ent->nargs > 4
+	if (n_args(tcp) > 4
+ 	    && umoven(tcp, mips_REG_SP + 4 * sizeof(tcp->u_arg[0]),
+-		      (tcp->s_ent->nargs - 4) * sizeof(tcp->u_arg[0]),
+		      (n_args(tcp) - 4) * sizeof(tcp->u_arg[0]),
+ 		      &tcp->u_arg[4]) < 0) {
+ 		/*
+ 		 * Let's proceed with the first 4 arguments
+ 		 * instead of reporting the failure.
+ 		 */
+ 		memset(&tcp->u_arg[4], 0,
+-		       (tcp->s_ent->nargs - 4) * sizeof(tcp->u_arg[0]));
+		       (n_args(tcp) - 4) * sizeof(tcp->u_arg[0]));
+ 	}
+ #else
+ # error unsupported mips abi
+diff --git a/linux/sh/get_syscall_args.c b/linux/sh/get_syscall_args.c
+index b4ee1dd..02593b0 100644
+--- a/linux/sh/get_syscall_args.c
+++ b/linux/sh/get_syscall_args.c
+@@ -12,7 +12,7 @@ get_syscall_args(struct tcb *tcp)
+ 	};
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, syscall_regs[i], &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/linux/sh64/get_syscall_args.c b/linux/sh64/get_syscall_args.c
+index e35c350..241ff09 100644
+--- a/linux/sh64/get_syscall_args.c
+++ b/linux/sh64/get_syscall_args.c
+@@ -6,7 +6,7 @@ get_syscall_args(struct tcb *tcp)
+ 	static const int syscall_regs[MAX_ARGS] = { 2, 3, 4, 5, 6, 7 };
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, REG_GENERAL(syscall_regs[i]),
+ 			  &tcp->u_arg[i]) < 0)
+ 			return -1;
+diff --git a/linux/x86_64/get_syscall_args.c b/linux/x86_64/get_syscall_args.c
+index f285ac3..8ee8ebd 100644
+--- a/linux/x86_64/get_syscall_args.c
+++ b/linux/x86_64/get_syscall_args.c
+@@ -4,7 +4,7 @@ get_syscall_args(struct tcb *tcp)
+ {
+ 	if (x86_io.iov_len != sizeof(i386_regs)) {
+ 		/* x86-64 or x32 ABI */
+-		if (tcp->s_ent->sys_flags & COMPAT_SYSCALL_TYPES) {
+		if (tcp_sysent(tcp)->sys_flags & COMPAT_SYSCALL_TYPES) {
+ 			/*
+ 			 * X32 compat syscall: zero-extend from 32 bits.
+ 			 * Use truncate_klong_to_current_wordsize(tcp->u_arg[N])
+diff --git a/linux/xtensa/get_syscall_args.c b/linux/xtensa/get_syscall_args.c
+index 2a20cdb..6903221 100644
+--- a/linux/xtensa/get_syscall_args.c
+++ b/linux/xtensa/get_syscall_args.c
+@@ -13,7 +13,7 @@ get_syscall_args(struct tcb *tcp)
+ 	};
+ 	unsigned int i;
+ 
+-	for (i = 0; i < tcp->s_ent->nargs; ++i)
+	for (i = 0; i < n_args(tcp); ++i)
+ 		if (upeek(tcp, xtensaregs[i], &tcp->u_arg[i]) < 0)
+ 			return -1;
+ 	return 1;
+diff --git a/pathtrace.c b/pathtrace.c
+index 2cd12e6..5493028 100644
+--- a/pathtrace.c
+++ b/pathtrace.c
+@@ -167,7 +167,7 @@ pathtrace_match_set(struct tcb *tcp, struct path_set *set)
+ {
+ 	const struct_sysent *s;
+ 
+-	s = tcp->s_ent;
+	s = tcp_sysent(tcp);
+ 
+ 	if (!(s->sys_flags & (TRACE_FILE | TRACE_DESC | TRACE_NETWORK)))
+ 		return false;
+diff --git a/prctl.c b/prctl.c
+index 5830f11..c31ea60 100644
+--- a/prctl.c
+++ b/prctl.c
+@@ -61,7 +61,7 @@ print_prctl_args(struct tcb *tcp, const unsigned int first)
+ {
+ 	unsigned int i;
+ 
+-	for (i = first; i < tcp->s_ent->nargs; ++i)
+	for (i = first; i < n_args(tcp); ++i)
+ 		tprintf(", %#" PRI_klx, tcp->u_arg[i]);
+ }
+ 
+diff --git a/signal.c b/signal.c
+index 17a3f79..e59a76d 100644
+--- a/signal.c
+++ b/signal.c
+@@ -383,10 +383,10 @@ SYS_FUNC(sgetmask)
+ SYS_FUNC(sigsuspend)
+ {
+ #ifdef MIPS
+-	print_sigset_addr_len(tcp, tcp->u_arg[tcp->s_ent->nargs - 1],
+	print_sigset_addr_len(tcp, tcp->u_arg[n_args(tcp) - 1],
+ 			      current_wordsize);
+ #else
+-	tprint_old_sigmask_val("", tcp->u_arg[tcp->s_ent->nargs - 1]);
+	tprint_old_sigmask_val("", tcp->u_arg[n_args(tcp) - 1]);
+ #endif
+ 
+ 	return RVAL_DECODED;
+diff --git a/syscall.c b/syscall.c
+index 33f6dcd..40fcedb 100644
+--- a/syscall.c
+++ b/syscall.c
+@@ -339,7 +339,7 @@ decode_ipc_subcall(struct tcb *tcp)
+ 	tcp->qual_flg = qual_flags(tcp->scno);
+ 	tcp->s_ent = &sysent[tcp->scno];
+ 
+-	const unsigned int n = tcp->s_ent->nargs;
+	const unsigned int n = n_args(tcp);
+ 	unsigned int i;
+ 	for (i = 0; i < n; i++)
+ 		tcp->u_arg[i] = tcp->u_arg[i + 1];
+@@ -363,7 +363,7 @@ decode_syscall_subcall(struct tcb *tcp)
+ 	 * and sync_file_range) requires additional code,
+ 	 * see linux/mips/get_syscall_args.c
+ 	 */
+-	if (tcp->s_ent->nargs == MAX_ARGS) {
+	if (n_args(tcp) == MAX_ARGS) {
+ 		if (umoven(tcp,
+ 			   mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
+ 			   sizeof(tcp->u_arg[0]),
+@@ -382,7 +382,7 @@ dumpio(struct tcb *tcp)
+ 		return;
+ 
+ 	if (is_number_in_set(fd, write_set)) {
+-		switch (tcp->s_ent->sen) {
+		switch (tcp_sysent(tcp)->sen) {
+ 		case SEN_write:
+ 		case SEN_pwrite:
+ 		case SEN_send:
+@@ -409,7 +409,7 @@ dumpio(struct tcb *tcp)
+ 		return;
+ 
+ 	if (is_number_in_set(fd, read_set)) {
+-		switch (tcp->s_ent->sen) {
+		switch (tcp_sysent(tcp)->sen) {
+ 		case SEN_read:
+ 		case SEN_pread:
+ 		case SEN_recv:
+@@ -573,7 +573,7 @@ tamper_with_syscall_exiting(struct tcb *tcp)
+ 
+ 	if (update_tcb) {
+ 		tcp->u_error = 0;
+-		get_error(tcp, !(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS));
+		get_error(tcp, !(tcp_sysent(tcp)->sys_flags & SYSCALL_NEVER_FAILS));
+ 	}
+ 
+ 	return 0;
+@@ -593,10 +593,9 @@ syscall_entering_decode(struct tcb *tcp)
+ 	int res = get_scno(tcp);
+ 	if (res == 0)
+ 		return res;
+-	int scno_good = res;
+ 	if (res != 1 || (res = get_syscall_args(tcp)) != 1) {
+ 		printleader(tcp);
+-		tprintf("%s(", scno_good == 1 ? tcp->s_ent->sys_name : "????");
+		tprintf("%s(", tcp_sysent(tcp)->sys_name);
+ 		/*
+ 		 * " <unavailable>" will be added later by the code which
+ 		 * detects ptrace errors.
+@@ -608,7 +607,7 @@ syscall_entering_decode(struct tcb *tcp)
+  || defined SYS_socket_subcall	\
+  || defined SYS_syscall_subcall
+ 	for (;;) {
+-		switch (tcp->s_ent->sen) {
+		switch (tcp_sysent(tcp)->sen) {
+ # ifdef SYS_ipc_subcall
+ 		case SEN_ipc:
+ 			decode_ipc_subcall(tcp);
+@@ -622,7 +621,7 @@ syscall_entering_decode(struct tcb *tcp)
+ # ifdef SYS_syscall_subcall
+ 		case SEN_syscall:
+ 			decode_syscall_subcall(tcp);
+-			if (tcp->s_ent->sen != SEN_syscall)
+			if (tcp_sysent(tcp)->sen != SEN_syscall)
+ 				continue;
+ 			break;
+ # endif
+@@ -642,7 +641,7 @@ syscall_entering_trace(struct tcb *tcp, unsigned int *sig)
+ 		tcp->qual_flg &= ~QUAL_INJECT;
+ 	}
+ 
+-	switch (tcp->s_ent->sen) {
+	switch (tcp_sysent(tcp)->sen) {
+ 		case SEN_execve:
+ 		case SEN_execveat:
+ #if defined SPARC || defined SPARC64
+@@ -672,14 +671,14 @@ syscall_entering_trace(struct tcb *tcp, unsigned int *sig)
+ 
+ #ifdef ENABLE_STACKTRACE
+ 	if (stack_trace_enabled) {
+-		if (tcp->s_ent->sys_flags & STACKTRACE_CAPTURE_ON_ENTER)
+		if (tcp_sysent(tcp)->sys_flags & STACKTRACE_CAPTURE_ON_ENTER)
+ 			unwind_tcb_capture(tcp);
+ 	}
+ #endif
+ 
+ 	printleader(tcp);
+-	tprintf("%s(", tcp->s_ent->sys_name);
+-	int res = raw(tcp) ? printargs(tcp) : tcp->s_ent->sys_func(tcp);
+	tprintf("%s(", tcp_sysent(tcp)->sys_name);
+	int res = raw(tcp) ? printargs(tcp) : tcp_sysent(tcp)->sys_func(tcp);
+ 	fflush(tcp->outf);
+ 	return res;
+ }
+@@ -709,7 +708,7 @@ syscall_exiting_decode(struct tcb *tcp, struct timespec *pts)
+ 	if ((Tflag || cflag) && !(filtered(tcp) || hide_log(tcp)))
+ 		clock_gettime(CLOCK_MONOTONIC, pts);
+ 
+-	if (tcp->s_ent->sys_flags & MEMORY_MAPPING_CHANGE)
+	if (tcp_sysent(tcp)->sys_flags & MEMORY_MAPPING_CHANGE)
+ 		mmap_notify_report(tcp);
+ 
+ 	if (filtered(tcp) || hide_log(tcp))
+@@ -738,7 +737,7 @@ print_syscall_resume(struct tcb *tcp)
+ 	    || (tcp->flags & TCB_REPRINT)) {
+ 		tcp->flags &= ~TCB_REPRINT;
+ 		printleader(tcp);
+-		tprintf("<... %s resumed>", tcp->s_ent->sys_name);
+		tprintf("<... %s resumed>", tcp_sysent(tcp)->sys_name);
+ 	}
+ }
+ 
+@@ -786,7 +785,7 @@ syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res)
+ 		if (tcp->sys_func_rval & RVAL_DECODED)
+ 			sys_res = tcp->sys_func_rval;
+ 		else
+-			sys_res = tcp->s_ent->sys_func(tcp);
+			sys_res = tcp_sysent(tcp)->sys_func(tcp);
+ 	}
+ 
+ 	tprints(") ");
+@@ -1175,6 +1174,13 @@ free_sysent_buf(void *ptr)
+ 	free(ptr);
+ }
+ 
+const struct_sysent stub_sysent = {
+	.nargs = MAX_ARGS,
+	.sen = SEN_printargs,
+	.sys_func = printargs,
+	.sys_name = "????",
+};
+
+ /*
+  * Returns:
+  * 0: "ignore this ptrace stop", syscall_entering_decode() should return a "bail
+@@ -1186,6 +1192,10 @@ free_sysent_buf(void *ptr)
+ int
+ get_scno(struct tcb *tcp)
+ {
+	tcp->scno = -1;
+	tcp->s_ent = NULL;
+	tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
+
+ 	if (get_regs(tcp) < 0)
+ 		return -1;
+ 
+@@ -1202,14 +1212,11 @@ get_scno(struct tcb *tcp)
+ 		struct sysent_buf *s = xcalloc(1, sizeof(*s));
+ 
+ 		s->tcp = tcp;
+-		s->ent.nargs = MAX_ARGS;
+-		s->ent.sen = SEN_printargs;
+-		s->ent.sys_func = printargs;
+		s->ent = stub_sysent;
+ 		s->ent.sys_name = s->buf;
+ 		xsprintf(s->buf, "syscall_%#" PRI_klx, shuffle_scno(tcp->scno));
+ 
+ 		tcp->s_ent = &s->ent;
+-		tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
+ 
+ 		set_tcb_priv_data(tcp, s, free_sysent_buf);
+ 
+@@ -1246,7 +1253,7 @@ get_syscall_result(struct tcb *tcp)
+ 		return -1;
+ 	tcp->u_error = 0;
+ 	get_error(tcp,
+-		  (!(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS)
+		  (!(tcp_sysent(tcp)->sys_flags & SYSCALL_NEVER_FAILS)
+ 			|| syscall_tampered(tcp))
+                   && !syscall_tampered_nofail(tcp));
+ 
+diff --git a/util.c b/util.c
+index aefedee..b841c0f 100644
+--- a/util.c
+++ b/util.c
+@@ -1161,7 +1161,7 @@ print_array_ex(struct tcb *const tcp,
+ int
+ printargs(struct tcb *tcp)
+ {
+-	const int n = tcp->s_ent->nargs;
+	const int n = n_args(tcp);
+ 	int i;
+ 	for (i = 0; i < n; ++i)
+ 		tprintf("%s%#" PRI_klx, i ? ", " : "", tcp->u_arg[i]);
+@@ -1171,7 +1171,7 @@ printargs(struct tcb *tcp)
+ int
+ printargs_u(struct tcb *tcp)
+ {
+-	const int n = tcp->s_ent->nargs;
+	const int n = n_args(tcp);
+ 	int i;
+ 	for (i = 0; i < n; ++i)
+ 		tprintf("%s%u", i ? ", " : "",
+@@ -1182,7 +1182,7 @@ printargs_u(struct tcb *tcp)
+ int
+ printargs_d(struct tcb *tcp)
+ {
+-	const int n = tcp->s_ent->nargs;
+	const int n = n_args(tcp);
+ 	int i;
+ 	for (i = 0; i < n; ++i)
+ 		tprintf("%s%d", i ? ", " : "",
+-- 
+2.1.4
+
--- a/SOURCES/0019-syscall.c-set-MEMORY_MAPPING_CHANGE-in-stub-sysent.patch
+++ b/SOURCES/0019-syscall.c-set-MEMORY_MAPPING_CHANGE-in-stub-sysent.patch
@ -0,0 +1,27 @@
+From 6f9c98e28df7cbc1e3417908604550956ca76f21 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Tue, 29 Jan 2019 15:35:00 +0100
+Subject: [PATCH 19/27] syscall.c: set MEMORY_MAPPING_CHANGE in stub sysent
+
+As unknown syscalls may incur unknown side effects.
+
+* syscall.c (stub_sysent): Set sys_flags to MEMORY_MAPPING_CHANGE.
+---
+ syscall.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/syscall.c b/syscall.c
+index 40fcedb..b836cd6 100644
+--- a/syscall.c
+++ b/syscall.c
+@@ -1176,6 +1176,7 @@ free_sysent_buf(void *ptr)
+ 
+ const struct_sysent stub_sysent = {
+ 	.nargs = MAX_ARGS,
+	.sys_flags = MEMORY_MAPPING_CHANGE,
+ 	.sen = SEN_printargs,
+ 	.sys_func = printargs,
+ 	.sys_name = "????",
+-- 
+2.1.4
+
--- a/SOURCES/0020-Make-inline-message-on-failed-restart-attempt-more-v.patch
+++ b/SOURCES/0020-Make-inline-message-on-failed-restart-attempt-more-v.patch
@ -0,0 +1,33 @@
+From 38a060e855568e2990affd5cd37aeda372f79c33 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Sun, 10 Feb 2019 19:49:46 +0100
+Subject: [PATCH 20/27] Make inline message on failed restart attempt more
+ verbose
+
+Hopefully, now it is less confusing.
+
+* strace.c (ptrace_restart): Provide intent and pid in the inline error
+message.
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1662936
+---
+ strace.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/strace.c b/strace.c
+index 7fe6548..f2aa846 100644
+--- a/strace.c
+++ b/strace.c
+@@ -380,7 +380,8 @@ ptrace_restart(const unsigned int op, struct tcb *const tcp, unsigned int sig)
+ 	 * but before we tried to restart it. Log looks ugly.
+ 	 */
+ 	if (current_tcp && current_tcp->curcol != 0) {
+-		tprintf(" <ptrace(%s):%s>\n", msg, strerror(err));
+		tprintf(" <Cannot restart pid %d with ptrace(%s): %s>\n",
+			tcp->pid, msg, strerror(err));
+ 		line_ended();
+ 	}
+ 	if (err == ESRCH)
+-- 
+2.1.4
+
--- a/SOURCES/0021-ptrace_restart-do-not-print-diagnostics-when-ptrace-.patch
+++ b/SOURCES/0021-ptrace_restart-do-not-print-diagnostics-when-ptrace-.patch
@ -0,0 +1,41 @@
+From 179063d63c4e1f49dd863db7ec5d70a3fa2a3713 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Mon, 11 Feb 2019 00:57:38 +0100
+Subject: [PATCH 21/27] ptrace_restart: do not print diagnostics when ptrace
+ returns ESRCH
+
+After some discussion, it was decided that the situation
+when the tracee is gone does not worth reporting.
+
+* strace.c (ptrace_restart): Return early if ptrace returned ESRCH.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1662936
+---
+ strace.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/strace.c b/strace.c
+index f2aa846..0745838 100644
+--- a/strace.c
+++ b/strace.c
+@@ -353,7 +353,7 @@ ptrace_restart(const unsigned int op, struct tcb *const tcp, unsigned int sig)
+ 	errno = 0;
+ 	ptrace(op, tcp->pid, 0L, (unsigned long) sig);
+ 	err = errno;
+-	if (!err)
+	if (!err || err == ESRCH)
+ 		return 0;
+ 
+ 	switch (op) {
+@@ -384,8 +384,6 @@ ptrace_restart(const unsigned int op, struct tcb *const tcp, unsigned int sig)
+ 			tcp->pid, msg, strerror(err));
+ 		line_ended();
+ 	}
+-	if (err == ESRCH)
+-		return 0;
+ 	errno = err;
+ 	perror_msg("ptrace(PTRACE_%s,pid:%d,sig:%u)", msg, tcp->pid, sig);
+ 	return -1;
+-- 
+2.1.4
+
--- a/SOURCES/0022-tests-add-kill_child-test.patch
+++ b/SOURCES/0022-tests-add-kill_child-test.patch
@ -0,0 +1,636 @@
+From f5888ee34b2cca8562d2878dbc6b2db9b8256672 Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Fri, 1 Feb 2019 11:04:51 +0100
+Subject: [PATCH 22/27] tests: add kill_child test
+
+This tests repeatedly creates and kills children, so some corner
+cases in handling of not-quite-existing processes can be observed.
+
+Previously, strace was crashing in the following situation:
+
+    13994 ????( <unfinished ...>
+    ...
+    13994 <... ???? resumed>) = ?
+
+as tcp->s_ent wasn't initialised on syscall entering and
+strace.c:print_event_exit segfaulted when tried to access
+tcp->s_ent->sys_name.
+
+* tests/kill_child.c: New file.
+* tests/kill_child.test: New test.
+* tests/.gitignore: Add kill_child.
+* tests/Makefile.am (check_PROGRAMS): Likewise.
+(MISC_TESTS): Add kill_child.test.
+
+Skipped files (not present in dist tarball):
+	tests/.gitignore
+
+Additional changes:
+	tests/Makefile.in (auto-generated from tests/Makefile.am)
+	tests-m32/Makefile.in (auto-generated from tests-m32/Makefile.am)
+	tests-m32/kill_child.c (copy of tests/kill_child.c)
+	tests-m32/kill_child.test (copy of tests/kill_child.test)
+	tests-m32/Makefile.in (auto-generted from tests-mx32/Makefile.am)
+	tests-mx32/kill_child.c (copy of tests/kill_child.c)
+	tests-mx32/kill_child.test (copy of tests/kill_child.test)
+
+Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
+---
+ tests/.gitignore      |  1 +
+ tests/Makefile.am     |  2 ++
+ tests/kill_child.c    | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/kill_child.test | 31 +++++++++++++++++++++++
+ 4 files changed, 103 insertions(+)
+ create mode 100644 tests/kill_child.c
+ create mode 100755 tests/kill_child.test
+
+Index: strace-4.24/tests/Makefile.am
+===================================================================
+--- strace-4.24.orig/tests/Makefile.am	2019-03-10 05:34:51.995141191 +0100
+++ strace-4.24/tests/Makefile.am	2019-03-10 05:40:37.969676713 +0100
+@@ -104,6 +104,7 @@
+ 	ioctl_perf-success \
+ 	ioctl_rtc-v \
+ 	is_linux_mips_n64 \
+	kill_child \
+ 	ksysent \
+ 	list_sigaction_signum \
+ 	localtime \
+@@ -299,6 +300,7 @@
+ 	get_regs.test \
+ 	inject-nf.test \
+ 	interactive_block.test \
+	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+ 	opipe.test \
+Index: strace-4.24/tests/kill_child.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/kill_child.c	2019-03-10 05:40:37.970676703 +0100
+@@ -0,0 +1,69 @@
+/*
+ * Check for the corner case that previously lead to segfault
+ * due to an attempt to access unitialised tcp->s_ent.
+ *
+ * 13994 ????( <unfinished ...>
+ * ...
+ * 13994 <... ???? resumed>) = ?
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+
+#include <sched.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+
+#define ITERS    10000
+#define SC_ITERS 10000
+
+int
+main(void)
+{
+	volatile sig_atomic_t *const mem =
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (mem == MAP_FAILED)
+		perror_msg_and_fail("mmap");
+
+	for (unsigned int i = 0; i < ITERS; ++i) {
+		mem[0] = mem[1] = 0;
+
+		const pid_t pid = fork();
+		if (pid < 0)
+			perror_msg_and_fail("fork");
+
+		if (!pid) {
+			/* wait for the parent */
+			while (!mem[0])
+				;
+			/* let the parent know we are running */
+			mem[1] = 1;
+
+			for (unsigned int j = 0; j < SC_ITERS; j++)
+				sched_yield();
+
+			pause();
+			return 0;
+		}
+
+		/* let the child know we are running */
+		mem[0] = 1;
+		/* wait for the child */
+		while (!mem[1])
+			;
+
+		if (kill(pid, SIGKILL))
+			perror_msg_and_fail("kill");
+		if (wait(NULL) != pid)
+			perror_msg_and_fail("wait");
+	}
+
+	return 0;
+}
+Index: strace-4.24/tests/kill_child.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/kill_child.test	2019-03-10 05:40:37.970676703 +0100
+@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Check whether repeated killing of just forked processes crashes strace.
+#
+# Copyright (c) 2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. "${srcdir=.}/init.sh"
+
+run_prog_skip_if_failed date +%s > /dev/null
+s0="$(date +%s)"
+
+run_prog
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
+
+# Run strace until the known corner case is observed.
+while :; do
+	run_strace $args
+
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
+	# used to segfault when the syscall number had not been obtained
+	# on syscall entering.
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
+
+	s1="$(date +%s)"
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
+		skip_ 'Unable to reproduce <... ???? resumed>'
+	fi
+done
+Index: strace-4.24/tests/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests/Makefile.in	2019-03-10 05:34:51.995141191 +0100
+++ strace-4.24/tests/Makefile.in	2019-03-10 05:40:37.973676673 +0100
+@@ -153,8 +153,9 @@
+ 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
+ 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
+-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+	localtime$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1186,6 +1187,10 @@
+ kill_OBJECTS = kill.$(OBJEXT)
+ kill_LDADD = $(LDADD)
+ kill_DEPENDENCIES = libtests.a
+kill_child_SOURCES = kill_child.c
+kill_child_OBJECTS = kill_child.$(OBJEXT)
+kill_child_LDADD = $(LDADD)
+kill_child_DEPENDENCIES = libtests.a
+ ksysent_SOURCES = ksysent.c
+ ksysent_OBJECTS = ksysent.$(OBJEXT)
+ ksysent_LDADD = $(LDADD)
+@@ -2741,9 +2746,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -2886,9 +2891,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -4227,6 +4232,7 @@
+ 	get_regs.test \
+ 	inject-nf.test \
+ 	interactive_block.test \
+	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+ 	opipe.test \
+@@ -5190,6 +5196,10 @@
+ 	@rm -f kill$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
+ 
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
+	@rm -f kill_child$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
+
+ ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
+ 	@rm -f ksysent$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
+@@ -6855,6 +6865,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@
+Index: strace-4.24/tests-m32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-m32/Makefile.in	2018-08-14 02:44:38.000000000 +0200
+++ strace-4.24/tests-m32/Makefile.in	2019-03-10 05:44:56.112091757 +0100
+@@ -153,8 +153,9 @@
+ 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
+ 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
+-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+	localtime$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1186,6 +1187,10 @@
+ kill_OBJECTS = kill.$(OBJEXT)
+ kill_LDADD = $(LDADD)
+ kill_DEPENDENCIES = libtests.a
+kill_child_SOURCES = kill_child.c
+kill_child_OBJECTS = kill_child.$(OBJEXT)
+kill_child_LDADD = $(LDADD)
+kill_child_DEPENDENCIES = libtests.a
+ ksysent_SOURCES = ksysent.c
+ ksysent_OBJECTS = ksysent.$(OBJEXT)
+ ksysent_LDADD = $(LDADD)
+@@ -2741,9 +2746,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -2886,9 +2891,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -4227,6 +4232,7 @@
+ 	get_regs.test \
+ 	inject-nf.test \
+ 	interactive_block.test \
+	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+ 	opipe.test \
+@@ -5190,6 +5196,10 @@
+ 	@rm -f kill$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
+ 
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
+	@rm -f kill_child$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
+
+ ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
+ 	@rm -f ksysent$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
+@@ -6855,6 +6865,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@
+Index: strace-4.24/tests-m32/kill_child.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/kill_child.c	2019-03-10 05:41:09.454361435 +0100
+@@ -0,0 +1,69 @@
+/*
+ * Check for the corner case that previously lead to segfault
+ * due to an attempt to access unitialised tcp->s_ent.
+ *
+ * 13994 ????( <unfinished ...>
+ * ...
+ * 13994 <... ???? resumed>) = ?
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+
+#include <sched.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+
+#define ITERS    10000
+#define SC_ITERS 10000
+
+int
+main(void)
+{
+	volatile sig_atomic_t *const mem =
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (mem == MAP_FAILED)
+		perror_msg_and_fail("mmap");
+
+	for (unsigned int i = 0; i < ITERS; ++i) {
+		mem[0] = mem[1] = 0;
+
+		const pid_t pid = fork();
+		if (pid < 0)
+			perror_msg_and_fail("fork");
+
+		if (!pid) {
+			/* wait for the parent */
+			while (!mem[0])
+				;
+			/* let the parent know we are running */
+			mem[1] = 1;
+
+			for (unsigned int j = 0; j < SC_ITERS; j++)
+				sched_yield();
+
+			pause();
+			return 0;
+		}
+
+		/* let the child know we are running */
+		mem[0] = 1;
+		/* wait for the child */
+		while (!mem[1])
+			;
+
+		if (kill(pid, SIGKILL))
+			perror_msg_and_fail("kill");
+		if (wait(NULL) != pid)
+			perror_msg_and_fail("wait");
+	}
+
+	return 0;
+}
+Index: strace-4.24/tests-m32/kill_child.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/kill_child.test	2019-03-10 05:41:25.066205103 +0100
+@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Check whether repeated killing of just forked processes crashes strace.
+#
+# Copyright (c) 2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. "${srcdir=.}/init.sh"
+
+run_prog_skip_if_failed date +%s > /dev/null
+s0="$(date +%s)"
+
+run_prog
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
+
+# Run strace until the known corner case is observed.
+while :; do
+	run_strace $args
+
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
+	# used to segfault when the syscall number had not been obtained
+	# on syscall entering.
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
+
+	s1="$(date +%s)"
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
+		skip_ 'Unable to reproduce <... ???? resumed>'
+	fi
+done
+Index: strace-4.24/tests-mx32/kill_child.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-mx32/kill_child.c	2019-03-10 05:41:12.566330273 +0100
+@@ -0,0 +1,69 @@
+/*
+ * Check for the corner case that previously lead to segfault
+ * due to an attempt to access unitialised tcp->s_ent.
+ *
+ * 13994 ????( <unfinished ...>
+ * ...
+ * 13994 <... ???? resumed>) = ?
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+
+#include <sched.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+
+#define ITERS    10000
+#define SC_ITERS 10000
+
+int
+main(void)
+{
+	volatile sig_atomic_t *const mem =
+		mmap(NULL, get_page_size(), PROT_READ | PROT_WRITE,
+		     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (mem == MAP_FAILED)
+		perror_msg_and_fail("mmap");
+
+	for (unsigned int i = 0; i < ITERS; ++i) {
+		mem[0] = mem[1] = 0;
+
+		const pid_t pid = fork();
+		if (pid < 0)
+			perror_msg_and_fail("fork");
+
+		if (!pid) {
+			/* wait for the parent */
+			while (!mem[0])
+				;
+			/* let the parent know we are running */
+			mem[1] = 1;
+
+			for (unsigned int j = 0; j < SC_ITERS; j++)
+				sched_yield();
+
+			pause();
+			return 0;
+		}
+
+		/* let the child know we are running */
+		mem[0] = 1;
+		/* wait for the child */
+		while (!mem[1])
+			;
+
+		if (kill(pid, SIGKILL))
+			perror_msg_and_fail("kill");
+		if (wait(NULL) != pid)
+			perror_msg_and_fail("wait");
+	}
+
+	return 0;
+}
+Index: strace-4.24/tests-mx32/kill_child.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-mx32/kill_child.test	2019-03-10 05:41:27.802177706 +0100
+@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Check whether repeated killing of just forked processes crashes strace.
+#
+# Copyright (c) 2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. "${srcdir=.}/init.sh"
+
+run_prog_skip_if_failed date +%s > /dev/null
+s0="$(date +%s)"
+
+run_prog
+args="-f -qq -e signal=none -e trace=sched_yield,/kill $args"
+
+# Run strace until the known corner case is observed.
+while :; do
+	run_strace $args
+
+	# Printing of "<... SYSCALL resumed>" in strace.c:print_event_exit
+	# used to segfault when the syscall number had not been obtained
+	# on syscall entering.
+	grep -q '^[1-9][0-9]* <\.\.\. ???? resumed>) \+= ?$' "$LOG" && exit 0
+
+	s1="$(date +%s)"
+	if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then
+		skip_ 'Unable to reproduce <... ???? resumed>'
+	fi
+done
+Index: strace-4.24/tests-mx32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-mx32/Makefile.in	2018-08-14 02:44:38.000000000 +0200
+++ strace-4.24/tests-mx32/Makefile.in	2019-03-10 05:45:49.892553217 +0100
+@@ -153,8 +153,9 @@
+ 	ioctl_evdev-v$(EXEEXT) ioctl_loop-nv$(EXEEXT) \
+ 	ioctl_loop-v$(EXEEXT) ioctl_nsfs$(EXEEXT) \
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+-	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
+-	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
+	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+	localtime$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1186,6 +1187,10 @@
+ kill_OBJECTS = kill.$(OBJEXT)
+ kill_LDADD = $(LDADD)
+ kill_DEPENDENCIES = libtests.a
+kill_child_SOURCES = kill_child.c
+kill_child_OBJECTS = kill_child.$(OBJEXT)
+kill_child_LDADD = $(LDADD)
+kill_child_DEPENDENCIES = libtests.a
+ ksysent_SOURCES = ksysent.c
+ ksysent_OBJECTS = ksysent.$(OBJEXT)
+ ksysent_LDADD = $(LDADD)
+@@ -2741,9 +2746,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -2886,9 +2891,9 @@
+ 	ipc_shm.c ipc_shm-Xabbrev.c ipc_shm-Xraw.c ipc_shm-Xverbose.c \
+ 	is_linux_mips_n64.c kcmp.c kcmp-y.c kern_features.c \
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+-	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
+-	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
+-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+ 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+ 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+ 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+@@ -4227,6 +4232,7 @@
+ 	get_regs.test \
+ 	inject-nf.test \
+ 	interactive_block.test \
+	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+ 	opipe.test \
+@@ -5190,6 +5196,10 @@
+ 	@rm -f kill$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
+ 
+kill_child$(EXEEXT): $(kill_child_OBJECTS) $(kill_child_DEPENDENCIES) $(EXTRA_kill_child_DEPENDENCIES) 
+	@rm -f kill_child$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(kill_child_OBJECTS) $(kill_child_LDADD) $(LIBS)
+
+ ksysent$(EXEEXT): $(ksysent_OBJECTS) $(ksysent_DEPENDENCIES) $(EXTRA_ksysent_DEPENDENCIES) 
+ 	@rm -f ksysent$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(ksysent_OBJECTS) $(ksysent_LDADD) $(LIBS)
+@@ -6855,6 +6865,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl-Xverbose.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill_child.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksysent.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown32.Po@am__quote@
--- a/SOURCES/0023-tests-move-PTRACE_SEIZE-check-to-a-separate-file.patch
+++ b/SOURCES/0023-tests-move-PTRACE_SEIZE-check-to-a-separate-file.patch
@ -0,0 +1,193 @@
+From ca7fc3695b061c48af1975d14a3e50a87329031a Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 6 Mar 2019 16:02:38 +0000
+Subject: [PATCH 23/27] tests: move PTRACE_SEIZE check to a separate file
+
+The check is going to be used by another test soon.
+
+* tests/PTRACE_SEIZE.sh: New file.
+* tests/detach-stopped.test: Use it.
+* tests/Makefile.am (EXTRA_DIST): Add PTRACE_SEIZE.sh.
+
+Conflicts:
+	tests/Makefile.am
+	tests/detach-stopped.test
+
+Additional changes:
+	tests-m32/PTRACE_SEIZE.sh (copy of tests/PTRACE_SEIZE.sh)
+	tests-m32/detach-stopped.test (copy of tests/detach-stopped.test)
+	tests-mx32/PTRACE_SEIZE.sh (copy of tests/PTRACE_SEIZE.sh)
+	tests-mx32/detach-stopped.test (copy of tests/detach-stopped.test)
+
+---
+ tests/Makefile.am         |  1 +
+ tests/PTRACE_SEIZE.sh     | 13 +++++++++++++
+ tests/detach-stopped.test |  6 +-----
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+ create mode 100755 tests/PTRACE_SEIZE.sh
+
+Index: strace-4.24/tests/Makefile.am
+===================================================================
+--- strace-4.24.orig/tests/Makefile.am	2019-03-10 05:40:37.969676713 +0100
+++ strace-4.24/tests/Makefile.am	2019-03-10 05:47:36.446486219 +0100
+@@ -361,6 +361,7 @@
+ EXTRA_DIST = \
+ 	COPYING \
+ 	GPL-2.0-or-later \
+	PTRACE_SEIZE.sh \
+ 	accept_compat.h \
+ 	attach-p-cmd.h \
+ 	caps-abbrev.awk \
+Index: strace-4.24/tests/PTRACE_SEIZE.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/PTRACE_SEIZE.sh	2019-03-10 05:47:36.447486209 +0100
+@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Skip the test if PTRACE_SEIZE is not supported.
+#
+# Copyright (c) 2014-2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+$STRACE -d -enone / > /dev/null 2> "$LOG" ||:
+if grep -x "[^:]*strace: PTRACE_SEIZE doesn't work" "$LOG" > /dev/null; then
+	skip_ "PTRACE_SEIZE doesn't work"
+fi
+Index: strace-4.24/tests/detach-stopped.test
+===================================================================
+--- strace-4.24.orig/tests/detach-stopped.test	2019-03-10 05:34:50.982151335 +0100
+++ strace-4.24/tests/detach-stopped.test	2019-03-10 05:47:36.447486209 +0100
+@@ -9,17 +9,13 @@
+ # SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ . "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"
+ 
+ run_prog_skip_if_failed \
+ 	kill -0 $$
+ 
+ check_prog sleep
+ 
+-$STRACE -d -enone / > /dev/null 2> "$LOG"
+-if grep -x "[^:]*strace: PTRACE_SEIZE doesn't work" "$LOG" > /dev/null; then
+-	skip_ "PTRACE_SEIZE doesn't work"
+-fi
+-
+ set -e
+ 
+ > "$LOG"
+Index: strace-4.24/tests-m32/PTRACE_SEIZE.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/PTRACE_SEIZE.sh	2019-03-10 05:48:20.038049708 +0100
+@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Skip the test if PTRACE_SEIZE is not supported.
+#
+# Copyright (c) 2014-2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+$STRACE -d -enone / > /dev/null 2> "$LOG" ||:
+if grep -x "[^:]*strace: PTRACE_SEIZE doesn't work" "$LOG" > /dev/null; then
+	skip_ "PTRACE_SEIZE doesn't work"
+fi
+Index: strace-4.24/tests-m32/detach-stopped.test
+===================================================================
+--- strace-4.24.orig/tests-m32/detach-stopped.test	2017-05-22 19:33:51.000000000 +0200
+++ strace-4.24/tests-m32/detach-stopped.test	2019-03-10 05:48:30.588944054 +0100
+@@ -6,40 +6,16 @@
+ # Copyright (c) 2014-2017 The strace developers.
+ # All rights reserved.
+ #
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-# 1. Redistributions of source code must retain the above copyright
+-#    notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-#    notice, this list of conditions and the following disclaimer in the
+-#    documentation and/or other materials provided with the distribution.
+-# 3. The name of the author may not be used to endorse or promote products
+-#    derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ . "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"
+ 
+ run_prog_skip_if_failed \
+ 	kill -0 $$
+ 
+ check_prog sleep
+ 
+-$STRACE -d -enone / > /dev/null 2> "$LOG"
+-if grep -x "[^:]*strace: PTRACE_SEIZE doesn't work" "$LOG" > /dev/null; then
+-	skip_ "PTRACE_SEIZE doesn't work"
+-fi
+-
+ set -e
+ 
+ > "$LOG"
+Index: strace-4.24/tests-mx32/detach-stopped.test
+===================================================================
+--- strace-4.24.orig/tests-mx32/detach-stopped.test	2017-05-22 19:33:51.000000000 +0200
+++ strace-4.24/tests-mx32/detach-stopped.test	2019-03-10 05:48:33.040919501 +0100
+@@ -6,40 +6,16 @@
+ # Copyright (c) 2014-2017 The strace developers.
+ # All rights reserved.
+ #
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-# 1. Redistributions of source code must retain the above copyright
+-#    notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-#    notice, this list of conditions and the following disclaimer in the
+-#    documentation and/or other materials provided with the distribution.
+-# 3. The name of the author may not be used to endorse or promote products
+-#    derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ . "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"
+ 
+ run_prog_skip_if_failed \
+ 	kill -0 $$
+ 
+ check_prog sleep
+ 
+-$STRACE -d -enone / > /dev/null 2> "$LOG"
+-if grep -x "[^:]*strace: PTRACE_SEIZE doesn't work" "$LOG" > /dev/null; then
+-	skip_ "PTRACE_SEIZE doesn't work"
+-fi
+-
+ set -e
+ 
+ > "$LOG"
--- a/SOURCES/0024-tests-check-tracing-of-orphaned-process-group.patch
+++ b/SOURCES/0024-tests-check-tracing-of-orphaned-process-group.patch
@ -0,0 +1,901 @@
+From 96dc1aa20237b80087f6c9ee29147bb85a5594d9 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 6 Mar 2019 16:02:38 +0000
+Subject: [PATCH 24/27] tests: check tracing of orphaned process group
+
+* tests/orphaned_process_group.c: New file.
+* tests/.gitignore: Add orphaned_process_group.
+* tests/Makefile.am (check_PROGRAMS): Likewise.
+* tests/gen_tests.in (orphaned_process_group): New test.
+
+Skipped files (not present in the tarball):
+	tests/.gitignore
+
+Additional changes:
+	tests/Makefile.in (generated from tests/Makefile.am)
+	tests/tests/orphaned_process_group.gen.test (generated from tests/gen_tests.in)
+	tests-m32/Makefile.in (generated from tests-m32/Makefile.am)
+	tests-m32/gen_tests.in (copy of tests/gen_tests.in)
+	tests-m32/orphaned_process_group.c (copy of tests/orphaned_process_group.c)
+	tests-m32/tests/orphaned_process_group.gen.test (generated from tests-m32/gen_tests.in)
+	tests-mx32/Makefile.in (generated from tests-mx32/Makefile.am)
+	tests-mx32/gen_tests.in (copy of tests/gen_tests.in)
+	tests-mx32/orphaned_process_group.c (copy of tests/orphaned_process_group.c)
+	tests-mx32/tests/orphaned_process_group.gen.test (generated from tests-mx32/gen_tests.in)
+
+---
+ tests/.gitignore               |   1 +
+ tests/Makefile.am              |   1 +
+ tests/gen_tests.in             |   1 +
+ tests/orphaned_process_group.c | 155 +++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 158 insertions(+)
+ create mode 100644 tests/orphaned_process_group.c
+
+Index: strace-4.24/tests/Makefile.am
+===================================================================
+--- strace-4.24.orig/tests/Makefile.am	2019-03-10 05:47:36.446486219 +0100
+++ strace-4.24/tests/Makefile.am	2019-03-10 05:50:05.488993755 +0100
+@@ -120,6 +120,7 @@
+ 	nsyscalls-d \
+ 	oldselect-P \
+ 	oldselect-efault-P \
+	orphaned_process_group \
+ 	pc \
+ 	perf_event_open_nonverbose \
+ 	perf_event_open_unabbrev \
+Index: strace-4.24/tests/gen_tests.in
+===================================================================
+--- strace-4.24.orig/tests/gen_tests.in	2019-03-10 05:19:26.185411954 +0100
+++ strace-4.24/tests/gen_tests.in	2019-03-10 05:50:05.488993755 +0100
+@@ -287,6 +287,7 @@
+ oldstat	-a32 -v -P stat.sample -P /dev/full
+ open	-a30 -P $NAME.sample
+ openat	-a36 -P $NAME.sample
+orphaned_process_group	. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+ osf_utimes	-a21
+ pause	-a8 -esignal=none
+ perf_event_open	-a1
+Index: strace-4.24/tests/orphaned_process_group.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/orphaned_process_group.c	2019-03-10 05:50:05.488993755 +0100
+@@ -0,0 +1,155 @@
+/*
+ * Check tracing of orphaned process group.
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#define TIMEOUT 5
+
+static void
+alarm_handler(const int no)
+{
+	error_msg_and_skip("Orphaned process group semantics"
+			   " is not supported by the kernel");
+}
+
+int
+main(void)
+{
+	int status;
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Create a pipe to track termination of processes.
+	 */
+	int pipe_fds[2];
+	if (pipe(pipe_fds))
+		perror_msg_and_fail("pipe");
+
+	/*
+	 * Create a leader for its own new process group.
+	 */
+	pid_t leader = fork();
+	if (leader < 0)
+		perror_msg_and_fail("fork");
+
+	if (leader) {
+		/*
+		 * Close the writing end of the pipe.
+		 */
+		close(pipe_fds[1]);
+
+		/*
+		 * Install the SIGALRM signal handler.
+		 */
+		static const struct sigaction sa = {
+			.sa_handler = alarm_handler
+		};
+		if (sigaction(SIGALRM, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		/*
+		 * Set an alarm clock.
+		 */
+		alarm(TIMEOUT);
+
+		/*
+		 * Wait for termination of the child process.
+		 */
+		if (waitpid(leader, &status, 0) != leader)
+			perror_msg_and_fail("waitpid leader");
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			error_msg_and_fail("waitpid leader: "
+					   "unexpected wait status %d",
+					   status);
+
+		/*
+		 * Wait for termination of all processes
+		 * in the process group of the child process.
+		 */
+		if (read(pipe_fds[0], &status, sizeof(status)) != 0)
+			perror_msg_and_fail("read");
+
+		/*
+		 * At this point all processes are gone.
+		 * Let the tracer time to catch up.
+		 */
+		alarm(0);
+		sleep(1);
+		return 0;
+	}
+
+	/*
+	 * Close the reading end of the pipe.
+	 */
+	close(pipe_fds[0]);
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * When the leader process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		static const struct sigaction sa = { .sa_handler = SIG_DFL };
+		if (sigaction(SIGHUP, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("unexpected wait status %d", status);
+
+	/*
+	 * Print the expected output.
+	 */
+	leader = getpid();
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
+	       ", si_pid=%d, si_uid=%u} ---\n",
+	       stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
+	printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
+	printf("%-5d +++ exited with 0 +++\n", leader);
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_KERNEL} ---\n",
+	       stopped, "SIGHUP", "SIGHUP");
+	printf("%-5d +++ killed by %s +++\n", stopped, "SIGHUP");
+	printf("%-5d +++ exited with 0 +++\n", getppid());
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests-m32/orphaned_process_group.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/orphaned_process_group.c	2019-03-10 05:51:47.527971970 +0100
+@@ -0,0 +1,155 @@
+/*
+ * Check tracing of orphaned process group.
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#define TIMEOUT 5
+
+static void
+alarm_handler(const int no)
+{
+	error_msg_and_skip("Orphaned process group semantics"
+			   " is not supported by the kernel");
+}
+
+int
+main(void)
+{
+	int status;
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Create a pipe to track termination of processes.
+	 */
+	int pipe_fds[2];
+	if (pipe(pipe_fds))
+		perror_msg_and_fail("pipe");
+
+	/*
+	 * Create a leader for its own new process group.
+	 */
+	pid_t leader = fork();
+	if (leader < 0)
+		perror_msg_and_fail("fork");
+
+	if (leader) {
+		/*
+		 * Close the writing end of the pipe.
+		 */
+		close(pipe_fds[1]);
+
+		/*
+		 * Install the SIGALRM signal handler.
+		 */
+		static const struct sigaction sa = {
+			.sa_handler = alarm_handler
+		};
+		if (sigaction(SIGALRM, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		/*
+		 * Set an alarm clock.
+		 */
+		alarm(TIMEOUT);
+
+		/*
+		 * Wait for termination of the child process.
+		 */
+		if (waitpid(leader, &status, 0) != leader)
+			perror_msg_and_fail("waitpid leader");
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			error_msg_and_fail("waitpid leader: "
+					   "unexpected wait status %d",
+					   status);
+
+		/*
+		 * Wait for termination of all processes
+		 * in the process group of the child process.
+		 */
+		if (read(pipe_fds[0], &status, sizeof(status)) != 0)
+			perror_msg_and_fail("read");
+
+		/*
+		 * At this point all processes are gone.
+		 * Let the tracer time to catch up.
+		 */
+		alarm(0);
+		sleep(1);
+		return 0;
+	}
+
+	/*
+	 * Close the reading end of the pipe.
+	 */
+	close(pipe_fds[0]);
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * When the leader process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		static const struct sigaction sa = { .sa_handler = SIG_DFL };
+		if (sigaction(SIGHUP, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("unexpected wait status %d", status);
+
+	/*
+	 * Print the expected output.
+	 */
+	leader = getpid();
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
+	       ", si_pid=%d, si_uid=%u} ---\n",
+	       stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
+	printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
+	printf("%-5d +++ exited with 0 +++\n", leader);
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_KERNEL} ---\n",
+	       stopped, "SIGHUP", "SIGHUP");
+	printf("%-5d +++ killed by %s +++\n", stopped, "SIGHUP");
+	printf("%-5d +++ exited with 0 +++\n", getppid());
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests-mx32/orphaned_process_group.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-mx32/orphaned_process_group.c	2019-03-10 05:51:50.259944613 +0100
+@@ -0,0 +1,155 @@
+/*
+ * Check tracing of orphaned process group.
+ *
+ * Copyright (c) 2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#define TIMEOUT 5
+
+static void
+alarm_handler(const int no)
+{
+	error_msg_and_skip("Orphaned process group semantics"
+			   " is not supported by the kernel");
+}
+
+int
+main(void)
+{
+	int status;
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Create a pipe to track termination of processes.
+	 */
+	int pipe_fds[2];
+	if (pipe(pipe_fds))
+		perror_msg_and_fail("pipe");
+
+	/*
+	 * Create a leader for its own new process group.
+	 */
+	pid_t leader = fork();
+	if (leader < 0)
+		perror_msg_and_fail("fork");
+
+	if (leader) {
+		/*
+		 * Close the writing end of the pipe.
+		 */
+		close(pipe_fds[1]);
+
+		/*
+		 * Install the SIGALRM signal handler.
+		 */
+		static const struct sigaction sa = {
+			.sa_handler = alarm_handler
+		};
+		if (sigaction(SIGALRM, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		/*
+		 * Set an alarm clock.
+		 */
+		alarm(TIMEOUT);
+
+		/*
+		 * Wait for termination of the child process.
+		 */
+		if (waitpid(leader, &status, 0) != leader)
+			perror_msg_and_fail("waitpid leader");
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			error_msg_and_fail("waitpid leader: "
+					   "unexpected wait status %d",
+					   status);
+
+		/*
+		 * Wait for termination of all processes
+		 * in the process group of the child process.
+		 */
+		if (read(pipe_fds[0], &status, sizeof(status)) != 0)
+			perror_msg_and_fail("read");
+
+		/*
+		 * At this point all processes are gone.
+		 * Let the tracer time to catch up.
+		 */
+		alarm(0);
+		sleep(1);
+		return 0;
+	}
+
+	/*
+	 * Close the reading end of the pipe.
+	 */
+	close(pipe_fds[0]);
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * When the leader process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		static const struct sigaction sa = { .sa_handler = SIG_DFL };
+		if (sigaction(SIGHUP, &sa, NULL))
+			perror_msg_and_fail("sigaction");
+
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("unexpected wait status %d", status);
+
+	/*
+	 * Print the expected output.
+	 */
+	leader = getpid();
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
+	       ", si_pid=%d, si_uid=%u} ---\n",
+	       stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
+	printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
+	printf("%-5d +++ exited with 0 +++\n", leader);
+	printf("%-5d --- %s {si_signo=%s, si_code=SI_KERNEL} ---\n",
+	       stopped, "SIGHUP", "SIGHUP");
+	printf("%-5d +++ killed by %s +++\n", stopped, "SIGHUP");
+	printf("%-5d +++ exited with 0 +++\n", getppid());
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests/Makefile.in	2019-03-10 05:40:37.973676673 +0100
+++ strace-4.24/tests/Makefile.in	2019-03-10 05:56:10.763336015 +0100
+@@ -161,8 +161,8 @@
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+ 	netlink_netlink_diag$(EXEEXT) netlink_unix_diag$(EXEEXT) \
+ 	nsyscalls$(EXEEXT) nsyscalls-d$(EXEEXT) oldselect-P$(EXEEXT) \
+-	oldselect-efault-P$(EXEEXT) pc$(EXEEXT) \
+-	perf_event_open_nonverbose$(EXEEXT) \
+	oldselect-efault-P$(EXEEXT) orphaned_process_group$(EXEEXT) \
+	pc$(EXEEXT) perf_event_open_nonverbose$(EXEEXT) \
+ 	perf_event_open_unabbrev$(EXEEXT) ppoll-v$(EXEEXT) \
+ 	prctl-seccomp-filter-v$(EXEEXT) prctl-seccomp-strict$(EXEEXT) \
+ 	prctl-spec-inject$(EXEEXT) print_maxfd$(EXEEXT) \
+@@ -1743,6 +1743,10 @@
+ openat_OBJECTS = openat.$(OBJEXT)
+ openat_LDADD = $(LDADD)
+ openat_DEPENDENCIES = libtests.a
+orphaned_process_group_SOURCES = orphaned_process_group.c
+orphaned_process_group_OBJECTS = orphaned_process_group.$(OBJEXT)
+orphaned_process_group_LDADD = $(LDADD)
+orphaned_process_group_DEPENDENCIES = libtests.a
+ osf_utimes_SOURCES = osf_utimes.c
+ osf_utimes_OBJECTS = osf_utimes.$(OBJEXT)
+ osf_utimes_LDADD = $(LDADD)
+@@ -2786,7 +2790,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -2931,7 +2936,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -4058,7 +4064,8 @@
+ 	oldselect.gen.test oldselect-P.gen.test \
+ 	oldselect-efault.gen.test oldselect-efault-P.gen.test \
+ 	oldstat.gen.test open.gen.test openat.gen.test \
+-	osf_utimes.gen.test pause.gen.test perf_event_open.gen.test \
+	orphaned_process_group.gen.test osf_utimes.gen.test \
+	pause.gen.test perf_event_open.gen.test \
+ 	perf_event_open_nonverbose.gen.test \
+ 	perf_event_open_unabbrev.gen.test personality-Xabbrev.gen.test \
+ 	personality-Xraw.gen.test personality-Xverbose.gen.test \
+@@ -5752,6 +5759,10 @@
+ 	@rm -f openat$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(openat_OBJECTS) $(openat_LDADD) $(LIBS)
+ 
+orphaned_process_group$(EXEEXT): $(orphaned_process_group_OBJECTS) $(orphaned_process_group_DEPENDENCIES) $(EXTRA_orphaned_process_group_DEPENDENCIES) 
+	@rm -f orphaned_process_group$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(orphaned_process_group_OBJECTS) $(orphaned_process_group_LDADD) $(LIBS)
+
+ osf_utimes$(EXEEXT): $(osf_utimes_OBJECTS) $(osf_utimes_DEPENDENCIES) $(EXTRA_osf_utimes_DEPENDENCIES) 
+ 	@rm -f osf_utimes$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(osf_utimes_OBJECTS) $(osf_utimes_LDADD) $(LIBS)
+@@ -7030,6 +7041,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orphaned_process_group.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osf_utimes.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pause.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc.Po@am__quote@
+@@ -9128,6 +9140,9 @@
+ $(srcdir)/openat.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+$(srcdir)/orphaned_process_group.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+	$(AM_V_GEN) $^ $@
+
+ $(srcdir)/osf_utimes.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+Index: strace-4.24/tests-m32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-m32/Makefile.in	2019-03-10 05:44:56.112091757 +0100
+++ strace-4.24/tests-m32/Makefile.in	2019-03-10 05:57:09.322749620 +0100
+@@ -161,8 +161,8 @@
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+ 	netlink_netlink_diag$(EXEEXT) netlink_unix_diag$(EXEEXT) \
+ 	nsyscalls$(EXEEXT) nsyscalls-d$(EXEEXT) oldselect-P$(EXEEXT) \
+-	oldselect-efault-P$(EXEEXT) pc$(EXEEXT) \
+-	perf_event_open_nonverbose$(EXEEXT) \
+	oldselect-efault-P$(EXEEXT) orphaned_process_group$(EXEEXT) \
+	pc$(EXEEXT) perf_event_open_nonverbose$(EXEEXT) \
+ 	perf_event_open_unabbrev$(EXEEXT) ppoll-v$(EXEEXT) \
+ 	prctl-seccomp-filter-v$(EXEEXT) prctl-seccomp-strict$(EXEEXT) \
+ 	prctl-spec-inject$(EXEEXT) print_maxfd$(EXEEXT) \
+@@ -1743,6 +1743,10 @@
+ openat_OBJECTS = openat.$(OBJEXT)
+ openat_LDADD = $(LDADD)
+ openat_DEPENDENCIES = libtests.a
+orphaned_process_group_SOURCES = orphaned_process_group.c
+orphaned_process_group_OBJECTS = orphaned_process_group.$(OBJEXT)
+orphaned_process_group_LDADD = $(LDADD)
+orphaned_process_group_DEPENDENCIES = libtests.a
+ osf_utimes_SOURCES = osf_utimes.c
+ osf_utimes_OBJECTS = osf_utimes.$(OBJEXT)
+ osf_utimes_LDADD = $(LDADD)
+@@ -2786,7 +2790,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -2931,7 +2936,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -4058,7 +4064,8 @@
+ 	oldselect.gen.test oldselect-P.gen.test \
+ 	oldselect-efault.gen.test oldselect-efault-P.gen.test \
+ 	oldstat.gen.test open.gen.test openat.gen.test \
+-	osf_utimes.gen.test pause.gen.test perf_event_open.gen.test \
+	orphaned_process_group.gen.test osf_utimes.gen.test \
+	pause.gen.test perf_event_open.gen.test \
+ 	perf_event_open_nonverbose.gen.test \
+ 	perf_event_open_unabbrev.gen.test personality-Xabbrev.gen.test \
+ 	personality-Xraw.gen.test personality-Xverbose.gen.test \
+@@ -5752,6 +5759,10 @@
+ 	@rm -f openat$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(openat_OBJECTS) $(openat_LDADD) $(LIBS)
+ 
+orphaned_process_group$(EXEEXT): $(orphaned_process_group_OBJECTS) $(orphaned_process_group_DEPENDENCIES) $(EXTRA_orphaned_process_group_DEPENDENCIES) 
+	@rm -f orphaned_process_group$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(orphaned_process_group_OBJECTS) $(orphaned_process_group_LDADD) $(LIBS)
+
+ osf_utimes$(EXEEXT): $(osf_utimes_OBJECTS) $(osf_utimes_DEPENDENCIES) $(EXTRA_osf_utimes_DEPENDENCIES) 
+ 	@rm -f osf_utimes$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(osf_utimes_OBJECTS) $(osf_utimes_LDADD) $(LIBS)
+@@ -7030,6 +7041,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orphaned_process_group.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osf_utimes.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pause.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc.Po@am__quote@
+@@ -9128,6 +9140,9 @@
+ $(srcdir)/openat.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+$(srcdir)/orphaned_process_group.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+	$(AM_V_GEN) $^ $@
+
+ $(srcdir)/osf_utimes.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+Index: strace-4.24/tests-mx32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-mx32/Makefile.in	2019-03-10 05:45:49.892553217 +0100
+++ strace-4.24/tests-mx32/Makefile.in	2019-03-10 05:57:19.939643305 +0100
+@@ -161,8 +161,8 @@
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+ 	netlink_netlink_diag$(EXEEXT) netlink_unix_diag$(EXEEXT) \
+ 	nsyscalls$(EXEEXT) nsyscalls-d$(EXEEXT) oldselect-P$(EXEEXT) \
+-	oldselect-efault-P$(EXEEXT) pc$(EXEEXT) \
+-	perf_event_open_nonverbose$(EXEEXT) \
+	oldselect-efault-P$(EXEEXT) orphaned_process_group$(EXEEXT) \
+	pc$(EXEEXT) perf_event_open_nonverbose$(EXEEXT) \
+ 	perf_event_open_unabbrev$(EXEEXT) ppoll-v$(EXEEXT) \
+ 	prctl-seccomp-filter-v$(EXEEXT) prctl-seccomp-strict$(EXEEXT) \
+ 	prctl-spec-inject$(EXEEXT) print_maxfd$(EXEEXT) \
+@@ -1743,6 +1743,10 @@
+ openat_OBJECTS = openat.$(OBJEXT)
+ openat_LDADD = $(LDADD)
+ openat_DEPENDENCIES = libtests.a
+orphaned_process_group_SOURCES = orphaned_process_group.c
+orphaned_process_group_OBJECTS = orphaned_process_group.$(OBJEXT)
+orphaned_process_group_LDADD = $(LDADD)
+orphaned_process_group_DEPENDENCIES = libtests.a
+ osf_utimes_SOURCES = osf_utimes.c
+ osf_utimes_OBJECTS = osf_utimes.$(OBJEXT)
+ osf_utimes_LDADD = $(LDADD)
+@@ -2786,7 +2790,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -2931,7 +2936,8 @@
+ 	old_mmap-P.c old_mmap-Xabbrev.c old_mmap-Xraw.c \
+ 	old_mmap-Xverbose.c old_mmap-v-none.c oldfstat.c oldlstat.c \
+ 	oldselect.c oldselect-P.c oldselect-efault.c \
+-	oldselect-efault-P.c oldstat.c open.c openat.c osf_utimes.c \
+	oldselect-efault-P.c oldstat.c open.c openat.c \
+	orphaned_process_group.c osf_utimes.c \
+ 	pause.c pc.c perf_event_open.c perf_event_open_nonverbose.c \
+ 	perf_event_open_unabbrev.c personality.c personality-Xabbrev.c \
+ 	personality-Xraw.c personality-Xverbose.c pipe.c pipe2.c \
+@@ -4058,7 +4064,8 @@
+ 	oldselect.gen.test oldselect-P.gen.test \
+ 	oldselect-efault.gen.test oldselect-efault-P.gen.test \
+ 	oldstat.gen.test open.gen.test openat.gen.test \
+-	osf_utimes.gen.test pause.gen.test perf_event_open.gen.test \
+	orphaned_process_group.gen.test osf_utimes.gen.test \
+	pause.gen.test perf_event_open.gen.test \
+ 	perf_event_open_nonverbose.gen.test \
+ 	perf_event_open_unabbrev.gen.test personality-Xabbrev.gen.test \
+ 	personality-Xraw.gen.test personality-Xverbose.gen.test \
+@@ -5752,6 +5759,10 @@
+ 	@rm -f openat$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(openat_OBJECTS) $(openat_LDADD) $(LIBS)
+ 
+orphaned_process_group$(EXEEXT): $(orphaned_process_group_OBJECTS) $(orphaned_process_group_DEPENDENCIES) $(EXTRA_orphaned_process_group_DEPENDENCIES) 
+	@rm -f orphaned_process_group$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(orphaned_process_group_OBJECTS) $(orphaned_process_group_LDADD) $(LIBS)
+
+ osf_utimes$(EXEEXT): $(osf_utimes_OBJECTS) $(osf_utimes_DEPENDENCIES) $(EXTRA_osf_utimes_DEPENDENCIES) 
+ 	@rm -f osf_utimes$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(osf_utimes_OBJECTS) $(osf_utimes_LDADD) $(LIBS)
+@@ -7030,6 +7041,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orphaned_process_group.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osf_utimes.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pause.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc.Po@am__quote@
+@@ -9128,6 +9140,9 @@
+ $(srcdir)/openat.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+$(srcdir)/orphaned_process_group.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+	$(AM_V_GEN) $^ $@
+
+ $(srcdir)/osf_utimes.gen.test: $(abs_srcdir)/gen_tests.sh $(srcdir)/gen_tests.in
+ 	$(AM_V_GEN) $^ $@
+ 
+Index: strace-4.24/tests-m32/orphaned_process_group.gen.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/orphaned_process_group.gen.test	2019-03-10 05:59:50.567134970 +0100
+@@ -0,0 +1,4 @@
+#!/bin/sh -efu
+# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (orphaned_process_group . "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'); do not edit.
+. "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+Index: strace-4.24/tests-mx32/orphaned_process_group.gen.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-mx32/orphaned_process_group.gen.test	2019-03-10 05:59:51.671123915 +0100
+@@ -0,0 +1,4 @@
+#!/bin/sh -efu
+# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (orphaned_process_group . "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'); do not edit.
+. "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+Index: strace-4.24/tests/orphaned_process_group.gen.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/orphaned_process_group.gen.test	2019-03-10 05:59:48.722153445 +0100
+@@ -0,0 +1,4 @@
+#!/bin/sh -efu
+# Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (orphaned_process_group . "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'); do not edit.
+. "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+Index: strace-4.24/tests-m32/gen_tests.in
+===================================================================
+--- strace-4.24.orig/tests-m32/gen_tests.in	2018-08-01 16:57:16.000000000 +0200
+++ strace-4.24/tests-m32/gen_tests.in	2019-03-10 06:00:59.151448188 +0100
+@@ -3,27 +3,7 @@
+ # Copyright (c) 2017-2018 The strace developers.
+ # All rights reserved.
+ #
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-# 1. Redistributions of source code must retain the above copyright
+-#    notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-#    notice, this list of conditions and the following disclaimer in the
+-#    documentation and/or other materials provided with the distribution.
+-# 3. The name of the author may not be used to endorse or promote products
+-#    derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ _newselect
+ _newselect-P	 -e trace=_newselect -P /dev/full 9>>/dev/full
+@@ -307,6 +287,7 @@
+ oldstat	-a32 -v -P stat.sample -P /dev/full
+ open	-a30 -P $NAME.sample
+ openat	-a36 -P $NAME.sample
+orphaned_process_group	. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+ osf_utimes	-a21
+ pause	-a8 -esignal=none
+ perf_event_open	-a1
+Index: strace-4.24/tests-mx32/gen_tests.in
+===================================================================
+--- strace-4.24.orig/tests-mx32/gen_tests.in	2018-08-01 16:57:16.000000000 +0200
+++ strace-4.24/tests-mx32/gen_tests.in	2019-03-10 06:01:00.297436713 +0100
+@@ -3,27 +3,7 @@
+ # Copyright (c) 2017-2018 The strace developers.
+ # All rights reserved.
+ #
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-# 1. Redistributions of source code must retain the above copyright
+-#    notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-#    notice, this list of conditions and the following disclaimer in the
+-#    documentation and/or other materials provided with the distribution.
+-# 3. The name of the author may not be used to endorse or promote products
+-#    derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ _newselect
+ _newselect-P	 -e trace=_newselect -P /dev/full 9>>/dev/full
+@@ -307,6 +287,7 @@
+ oldstat	-a32 -v -P stat.sample -P /dev/full
+ open	-a30 -P $NAME.sample
+ openat	-a36 -P $NAME.sample
+orphaned_process_group	. "${srcdir=.}/PTRACE_SEIZE.sh"; run_strace_match_diff -f -e trace=none -e signal='!chld'
+ osf_utimes	-a21
+ pause	-a8 -esignal=none
+ perf_event_open	-a1
--- a/SOURCES/0025-tests-check-tracing-of-looping-threads.patch
+++ b/SOURCES/0025-tests-check-tracing-of-looping-threads.patch
@ -0,0 +1,788 @@
+From 1fc4e011bb0d977b64385e5dff91620c42985bcf Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 4 Jul 2018 02:11:27 +0000
+Subject: [PATCH 25/27] tests: check tracing of looping threads
+
+* test/many_looping_threads.c: Remove.
+* test/.gitignore: Remove many_looping_threads.
+* test/Makefile (PROGS): Likewise.
+(many_looping_threads): Remove.
+* tests/looping_threads.c: New file.
+* tests/looping_threads.test: New test.
+* tests/.gitignore: Add looping_threads.
+* tests/Makefile.am (check_PROGRAMS): Likewise.
+(looping_threads_LDADD): New variable.
+(MISC_TESTS, XFAIL_TESTS): Add looping_threads.test.
+
+Conflicts:
+	tests/Makefile.am
+
+Skipped files (not present in the tarball):
+	test/.gitignore
+	test/Makefile
+	test/many_looping_threads.c
+	tests/.gitignore
+
+Additional changes:
+	tests/Makefile.in (generated from tests/Makefile.am)
+	tests-m32/Makefile.in (generated from tests-m32/Makefile.am)
+	tests-m32/looping_threads.c (copy of tests/looping_threads.c)
+	tests-m32/looping_threads.test (copy of tests/looping_threads.test)
+	tests-mx32/Makefile.in (generated from tests-mx32/Makefile.am)
+	tests-mx32/looping_threads.c (copy of tests/looping_threads.c)
+	tests-mx32/looping_threads.test (copy of tests/looping_threads.test)
+
+---
+ test/.gitignore             |   1 -
+ test/Makefile               |   5 +-
+ test/many_looping_threads.c |  49 ------------------
+ tests/.gitignore            |   1 +
+ tests/Makefile.am           |   6 ++-
+ tests/looping_threads.c     | 121 ++++++++++++++++++++++++++++++++++++++++++++
+ tests/looping_threads.test  |  38 ++++++++++++++
+ 7 files changed, 166 insertions(+), 55 deletions(-)
+ delete mode 100644 test/many_looping_threads.c
+ create mode 100644 tests/looping_threads.c
+ create mode 100755 tests/looping_threads.test
+
+Index: strace-4.24/tests/Makefile.am
+===================================================================
+--- strace-4.24.orig/tests/Makefile.am	2019-03-10 05:50:05.488993755 +0100
+++ strace-4.24/tests/Makefile.am	2019-03-10 06:01:56.696871947 +0100
+@@ -108,6 +108,7 @@
+ 	ksysent \
+ 	list_sigaction_signum \
+ 	localtime \
+	looping_threads \
+ 	mmsg-silent \
+ 	mmsg_name-v \
+ 	msg_control-v \
+@@ -172,6 +173,7 @@
+ fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ localtime_LDADD = $(clock_LIBS) $(LDADD)
+looping_threads_LDADD = -lpthread $(LDADD)
+ lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+@@ -304,6 +306,7 @@
+ 	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+	looping_threads.test \
+ 	opipe.test \
+ 	options-syntax.test \
+ 	pc.test \
+@@ -347,7 +350,8 @@
+ XFAIL_TESTS_mx32 = $(STACKTRACE_TESTS)
+ XFAIL_TESTS_x86_64 = int_0x80.gen.test
+ XFAIL_TESTS_x32 = int_0x80.gen.test
+-XFAIL_TESTS = $(XFAIL_TESTS_$(MPERS_NAME)) $(XFAIL_TESTS_$(ARCH))
+XFAIL_TESTS = $(XFAIL_TESTS_$(MPERS_NAME)) $(XFAIL_TESTS_$(ARCH)) \
+	      looping_threads.test
+ 
+ TEST_LOG_COMPILER = env
+ AM_TEST_LOG_FLAGS = STRACE_ARCH=$(ARCH) STRACE_NATIVE_ARCH=$(NATIVE_ARCH) \
+Index: strace-4.24/tests/looping_threads.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/looping_threads.c	2019-03-10 06:01:56.697871937 +0100
+@@ -0,0 +1,121 @@
+/*
+ * Check tracing of looping threads.
+ *
+ * Copyright (c) 2009-2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <assert.h>
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+static void *
+thread(void *arg)
+{
+	for (;;)
+		getuid();
+	return arg;
+}
+
+int
+main(int ac, const char *av[])
+{
+	assert(ac == 3);
+
+	int timeout = atoi(av[1]);
+	assert(timeout > 0);
+
+	int num_threads = atoi(av[2]);
+	assert(num_threads > 0);
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Reset SIGALRM and SIGHUP signal handlers.
+	 */
+	static const struct sigaction sa_def = { .sa_handler = SIG_DFL };
+	if (sigaction(SIGHUP, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGHUP");
+	if (sigaction(SIGALRM, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGALRM");
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * Set an alarm clock.
+	 */
+	alarm(timeout);
+
+	/*
+	 * When the main process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	int status;
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("waitpid WUNTRACED: "
+				   "unexpected wait status %d", status);
+	/*
+	 * Create all threads in a subprocess, this guarantees that
+	 * their tracer will not be their parent.
+	 */
+	pid_t pid = fork();
+	if (pid < 0)
+		perror_msg_and_fail("fork");
+	if (!pid) {
+		for (int i = 0; i < num_threads; i++) {
+			pthread_t t;
+			if ((errno = pthread_create(&t, NULL, thread, NULL))) {
+				if (EAGAIN == errno)
+					break;
+				perror_msg_and_fail("pthread_create #%d", i);
+			}
+		}
+
+		/* This terminates all threads created above.  */
+		_exit(0);
+	}
+
+	if (waitpid(pid, &status, 0) != pid)
+		perror_msg_and_fail("waitpid");
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+                error_msg_and_fail("waitpid: unexpected wait status %d",
+				   status);
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests/looping_threads.test
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests/looping_threads.test	2019-03-10 06:01:56.697871937 +0100
+@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Check tracing of looping threads.
+#
+# Copyright (c) 2009-2019 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. "${srcdir=.}/init.sh"
+. "${srcdir=.}/PTRACE_SEIZE.sh"
+
+run_prog ../orphaned_process_group > /dev/null
+
+run_prog_skip_if_failed date +%s > /dev/null
+s0="$(date +%s)"
+
+check_prog nproc
+inc="$(nproc)"
+[ "$inc" -ge 1 ] || inc=1
+
+timeout_2="$(($TIMEOUT_DURATION/2))"
+timeout_8="$(($TIMEOUT_DURATION/8))"
+nproc=1
+
+run_prog "../$NAME" "$timeout_8" "$nproc"
+
+while :; do
+	run_strace -f -qq -enone -esignal=none "../$NAME" "$timeout_2" "$nproc"
+
+	s1="$(date +%s)"
+	[ "$(($s1-$s0))" -lt "$timeout_8" ] ||
+		break
+
+	nproc="$(($nproc+$inc))"
+done
+
+warn_ "$ME_: nproc=$nproc elapsed=$(($s1-$s0))"
+Index: strace-4.24/tests-m32/looping_threads.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-m32/looping_threads.c	2019-03-10 06:02:29.984538615 +0100
+@@ -0,0 +1,121 @@
+/*
+ * Check tracing of looping threads.
+ *
+ * Copyright (c) 2009-2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <assert.h>
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+static void *
+thread(void *arg)
+{
+	for (;;)
+		getuid();
+	return arg;
+}
+
+int
+main(int ac, const char *av[])
+{
+	assert(ac == 3);
+
+	int timeout = atoi(av[1]);
+	assert(timeout > 0);
+
+	int num_threads = atoi(av[2]);
+	assert(num_threads > 0);
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Reset SIGALRM and SIGHUP signal handlers.
+	 */
+	static const struct sigaction sa_def = { .sa_handler = SIG_DFL };
+	if (sigaction(SIGHUP, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGHUP");
+	if (sigaction(SIGALRM, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGALRM");
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * Set an alarm clock.
+	 */
+	alarm(timeout);
+
+	/*
+	 * When the main process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	int status;
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("waitpid WUNTRACED: "
+				   "unexpected wait status %d", status);
+	/*
+	 * Create all threads in a subprocess, this guarantees that
+	 * their tracer will not be their parent.
+	 */
+	pid_t pid = fork();
+	if (pid < 0)
+		perror_msg_and_fail("fork");
+	if (!pid) {
+		for (int i = 0; i < num_threads; i++) {
+			pthread_t t;
+			if ((errno = pthread_create(&t, NULL, thread, NULL))) {
+				if (EAGAIN == errno)
+					break;
+				perror_msg_and_fail("pthread_create #%d", i);
+			}
+		}
+
+		/* This terminates all threads created above.  */
+		_exit(0);
+	}
+
+	if (waitpid(pid, &status, 0) != pid)
+		perror_msg_and_fail("waitpid");
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+                error_msg_and_fail("waitpid: unexpected wait status %d",
+				   status);
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests-mx32/looping_threads.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ strace-4.24/tests-mx32/looping_threads.c	2019-03-10 06:02:32.320515223 +0100
+@@ -0,0 +1,121 @@
+/*
+ * Check tracing of looping threads.
+ *
+ * Copyright (c) 2009-2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <assert.h>
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+static void *
+thread(void *arg)
+{
+	for (;;)
+		getuid();
+	return arg;
+}
+
+int
+main(int ac, const char *av[])
+{
+	assert(ac == 3);
+
+	int timeout = atoi(av[1]);
+	assert(timeout > 0);
+
+	int num_threads = atoi(av[2]);
+	assert(num_threads > 0);
+
+	/*
+	 * Unblock all signals.
+	 */
+	static sigset_t mask;
+	if (sigprocmask(SIG_SETMASK, &mask, NULL))
+		perror_msg_and_fail("sigprocmask");
+
+	/*
+	 * Reset SIGALRM and SIGHUP signal handlers.
+	 */
+	static const struct sigaction sa_def = { .sa_handler = SIG_DFL };
+	if (sigaction(SIGHUP, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGHUP");
+	if (sigaction(SIGALRM, &sa_def, NULL))
+		perror_msg_and_fail("sigaction SIGALRM");
+
+	/*
+	 * Create a new process group.
+	 */
+	if (setpgid(0, 0))
+		perror_msg_and_fail("setpgid");
+
+	/*
+	 * Set an alarm clock.
+	 */
+	alarm(timeout);
+
+	/*
+	 * When the main process terminates, the process group becomes orphaned.
+	 * If any member of the orphaned process group is stopped, then
+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
+	 * in the orphaned process group.
+	 * Create a process in a stopped state to activate this behaviour.
+	 */
+	const pid_t stopped = fork();
+	if (stopped < 0)
+		perror_msg_and_fail("fork");
+	if (!stopped) {
+		raise(SIGSTOP);
+		_exit(0);
+	}
+
+	/*
+	 * Wait for the process to stop.
+	 */
+	int status;
+	if (waitpid(stopped, &status, WUNTRACED) != stopped)
+		perror_msg_and_fail("waitpid WUNTRACED");
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
+                error_msg_and_fail("waitpid WUNTRACED: "
+				   "unexpected wait status %d", status);
+	/*
+	 * Create all threads in a subprocess, this guarantees that
+	 * their tracer will not be their parent.
+	 */
+	pid_t pid = fork();
+	if (pid < 0)
+		perror_msg_and_fail("fork");
+	if (!pid) {
+		for (int i = 0; i < num_threads; i++) {
+			pthread_t t;
+			if ((errno = pthread_create(&t, NULL, thread, NULL))) {
+				if (EAGAIN == errno)
+					break;
+				perror_msg_and_fail("pthread_create #%d", i);
+			}
+		}
+
+		/* This terminates all threads created above.  */
+		_exit(0);
+	}
+
+	if (waitpid(pid, &status, 0) != pid)
+		perror_msg_and_fail("waitpid");
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+                error_msg_and_fail("waitpid: unexpected wait status %d",
+				   status);
+
+	/*
+	 * Make the process group orphaned.
+	 */
+	return 0;
+}
+Index: strace-4.24/tests/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests/Makefile.in	2019-03-10 05:56:10.763336015 +0100
+++ strace-4.24/tests/Makefile.in	2019-03-10 06:05:55.655479092 +0100
+@@ -155,7 +155,7 @@
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+ 	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+ 	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+-	localtime$(EXEEXT) \
+	localtime$(EXEEXT) looping_threads$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1226,6 +1226,9 @@
+ lookup_dcookie_OBJECTS = lookup_dcookie.$(OBJEXT)
+ lookup_dcookie_LDADD = $(LDADD)
+ lookup_dcookie_DEPENDENCIES = libtests.a
+looping_threads_SOURCES = looping_threads.c
+looping_threads_OBJECTS = looping_threads.$(OBJEXT)
+looping_threads_DEPENDENCIES = $(LDADD)
+ lseek_SOURCES = lseek.c
+ lseek_OBJECTS = lseek.$(OBJEXT)
+ lseek_LDADD = $(LDADD)
+@@ -2752,11 +2755,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -2898,11 +2902,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -3922,6 +3927,7 @@
+ fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ localtime_LDADD = $(clock_LIBS) $(LDADD)
+looping_threads_LDADD = -lpthread $(LDADD)
+ lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+@@ -4242,6 +4248,7 @@
+ 	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+	looping_threads.test \
+ 	opipe.test \
+ 	options-syntax.test \
+ 	pc.test \
+@@ -5243,6 +5250,10 @@
+ 	@rm -f lookup_dcookie$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lookup_dcookie_OBJECTS) $(lookup_dcookie_LDADD) $(LIBS)
+ 
+looping_threads$(EXEEXT): $(looping_threads_OBJECTS) $(looping_threads_DEPENDENCIES) $(EXTRA_looping_threads_DEPENDENCIES) 
+	@rm -f looping_threads$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(looping_threads_OBJECTS) $(looping_threads_LDADD) $(LIBS)
+
+ lseek$(EXEEXT): $(lseek_OBJECTS) $(lseek_DEPENDENCIES) $(EXTRA_lseek_DEPENDENCIES) 
+ 	@rm -f lseek$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lseek_OBJECTS) $(lseek_LDADD) $(LIBS)
+@@ -6912,6 +6923,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup_dcookie.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/looping_threads.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat64-lstat64.Po@am__quote@
+Index: strace-4.24/tests-m32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-m32/Makefile.in	2019-03-10 05:57:09.322749620 +0100
+++ strace-4.24/tests-m32/Makefile.in	2019-03-10 06:06:47.107963863 +0100
+@@ -155,7 +155,7 @@
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+ 	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+ 	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+-	localtime$(EXEEXT) \
+	localtime$(EXEEXT) looping_threads$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1226,6 +1226,9 @@
+ lookup_dcookie_OBJECTS = lookup_dcookie.$(OBJEXT)
+ lookup_dcookie_LDADD = $(LDADD)
+ lookup_dcookie_DEPENDENCIES = libtests.a
+looping_threads_SOURCES = looping_threads.c
+looping_threads_OBJECTS = looping_threads.$(OBJEXT)
+looping_threads_DEPENDENCIES = $(LDADD)
+ lseek_SOURCES = lseek.c
+ lseek_OBJECTS = lseek.$(OBJEXT)
+ lseek_LDADD = $(LDADD)
+@@ -2752,11 +2755,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -2898,11 +2902,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -3922,6 +3927,7 @@
+ fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ localtime_LDADD = $(clock_LIBS) $(LDADD)
+looping_threads_LDADD = -lpthread $(LDADD)
+ lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+@@ -4242,6 +4248,7 @@
+ 	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+	looping_threads.test \
+ 	opipe.test \
+ 	options-syntax.test \
+ 	pc.test \
+@@ -5243,6 +5250,10 @@
+ 	@rm -f lookup_dcookie$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lookup_dcookie_OBJECTS) $(lookup_dcookie_LDADD) $(LIBS)
+ 
+looping_threads$(EXEEXT): $(looping_threads_OBJECTS) $(looping_threads_DEPENDENCIES) $(EXTRA_looping_threads_DEPENDENCIES) 
+	@rm -f looping_threads$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(looping_threads_OBJECTS) $(looping_threads_LDADD) $(LIBS)
+
+ lseek$(EXEEXT): $(lseek_OBJECTS) $(lseek_DEPENDENCIES) $(EXTRA_lseek_DEPENDENCIES) 
+ 	@rm -f lseek$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lseek_OBJECTS) $(lseek_LDADD) $(LIBS)
+@@ -6912,6 +6923,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup_dcookie.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/looping_threads.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat64-lstat64.Po@am__quote@
+Index: strace-4.24/tests-mx32/Makefile.in
+===================================================================
+--- strace-4.24.orig/tests-mx32/Makefile.in	2019-03-10 05:57:19.939643305 +0100
+++ strace-4.24/tests-mx32/Makefile.in	2019-03-10 06:06:42.992005079 +0100
+@@ -155,7 +155,7 @@
+ 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
+ 	is_linux_mips_n64$(EXEEXT) kill_child$(EXEEXT) \
+ 	ksysent$(EXEEXT) list_sigaction_signum$(EXEEXT) \
+-	localtime$(EXEEXT) \
+	localtime$(EXEEXT) looping_threads$(EXEEXT) \
+ 	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
+ 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
+ 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
+@@ -1226,6 +1226,9 @@
+ lookup_dcookie_OBJECTS = lookup_dcookie.$(OBJEXT)
+ lookup_dcookie_LDADD = $(LDADD)
+ lookup_dcookie_DEPENDENCIES = libtests.a
+looping_threads_SOURCES = looping_threads.c
+looping_threads_OBJECTS = looping_threads.$(OBJEXT)
+looping_threads_DEPENDENCIES = $(LDADD)
+ lseek_SOURCES = lseek.c
+ lseek_OBJECTS = lseek.$(OBJEXT)
+ lseek_LDADD = $(LDADD)
+@@ -2752,11 +2755,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -2898,11 +2902,12 @@
+ 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
+ 	keyctl-Xraw.c keyctl-Xverbose.c kill.c kill_child.c ksysent.c \
+ 	lchown.c lchown32.c link.c linkat.c list_sigaction_signum.c \
+-	llseek.c localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
+-	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
+-	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
+-	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
+-	mmap64.c mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+	llseek.c localtime.c lookup_dcookie.c looping_threads.c \
+	lseek.c lstat.c lstat64.c madvise.c mbind.c membarrier.c \
+	memfd_create.c migrate_pages.c mincore.c mkdir.c mkdirat.c \
+	mknod.c mknodat.c mlock.c mlock2.c mlockall.c mmap.c \
+	mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c mmap64.c \
+	mmap64-Xabbrev.c mmap64-Xraw.c mmap64-Xverbose.c \
+ 	mmsg.c mmsg-silent.c mmsg_name.c mmsg_name-v.c modify_ldt.c \
+ 	mount.c mount-Xabbrev.c mount-Xraw.c mount-Xverbose.c \
+ 	move_pages.c mq.c mq_sendrecv.c mq_sendrecv-read.c \
+@@ -3922,6 +3927,7 @@
+ fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ localtime_LDADD = $(clock_LIBS) $(LDADD)
+looping_threads_LDADD = -lpthread $(LDADD)
+ lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+ mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
+@@ -4242,6 +4248,7 @@
+ 	kill_child.test \
+ 	ksysent.test \
+ 	localtime.test \
+	looping_threads.test \
+ 	opipe.test \
+ 	options-syntax.test \
+ 	pc.test \
+@@ -5243,6 +5250,10 @@
+ 	@rm -f lookup_dcookie$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lookup_dcookie_OBJECTS) $(lookup_dcookie_LDADD) $(LIBS)
+ 
+looping_threads$(EXEEXT): $(looping_threads_OBJECTS) $(looping_threads_DEPENDENCIES) $(EXTRA_looping_threads_DEPENDENCIES) 
+	@rm -f looping_threads$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(looping_threads_OBJECTS) $(looping_threads_LDADD) $(LIBS)
+
+ lseek$(EXEEXT): $(lseek_OBJECTS) $(lseek_DEPENDENCIES) $(EXTRA_lseek_DEPENDENCIES) 
+ 	@rm -f lseek$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lseek_OBJECTS) $(lseek_LDADD) $(LIBS)
+@@ -6912,6 +6923,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup_dcookie.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/looping_threads.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat64-lstat64.Po@am__quote@
--- a/SOURCES/0026-Add-a-generic-list-implementation.patch
+++ b/SOURCES/0026-Add-a-generic-list-implementation.patch
@ -0,0 +1,368 @@
+From 31a5eee990d64a98a071ce74cd4d53190c0fe94b Mon Sep 17 00:00:00 2001
+From: Eugene Syromyatnikov <evgsyr@gmail.com>
+Date: Sun, 11 Sep 2016 12:11:45 +0300
+Subject: [PATCH 26/27] Add a generic list implementation
+
+Similar to the one used in the Linux kernel.
+
+* macros.h (cast_ptr, containerof): New macros.
+* list.h: New file.
+* Makefile.am (strace_SOURCES): Add it.
+---
+ Makefile.am |   1 +
+ list.h      | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ macros.h    |  19 ++++
+ 3 files changed, 320 insertions(+)
+ create mode 100644 list.h
+
+diff --git a/Makefile.am b/Makefile.am
+index f6679a3..f252bda 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -165,6 +165,7 @@ strace_SOURCES =	\
+ 	linux/asm_stat.h \
+ 	linux/x32/asm_stat.h \
+ 	linux/x86_64/asm_stat.h \
+	list.h		\
+ 	listen.c	\
+ 	lookup_dcookie.c \
+ 	loop.c		\
+diff --git a/list.h b/list.h
+new file mode 100644
+index 0000000..cf68fa7
+--- /dev/null
+++ b/list.h
+@@ -0,0 +1,300 @@
+/*
+ * Some simple implementation of lists similar to the one used in the kernel.
+ *
+ * Copyright (c) 2016-2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#ifndef STRACE_LIST_H
+#define STRACE_LIST_H
+
+/*
+ * struct list_item and related macros and functions provide an interface
+ * for manipulating and iterating linked lists.  In order to have list
+ * associated with its payload, struct list_item has to be embedded into
+ * a structure type representing payload, and (optionally) an additional
+ * struct list_item should be added somewhere as a starting point for list
+ * iteration (creating a list with a designated head). A situation where
+ * no designated head exists, and each embedded struct list_head is considered
+ * a head (i.e. starting point for list iteration), is also possible.
+ *
+ * List head has to be initialised with list_init() call. Statically allocated
+ * list heads can also be defined with an EMPTY_LIST() macro.
+ *
+ * In order to get a pointer to list item from a struct list_item, list_elem
+ * macro is used.
+ *
+ * When a designated head is used, list_head() and list_tail() can be used
+ * for getting pointer to the first and the last list item, respectively.
+ *
+ * list_next() and list_prev() macros can be used for obtaining pointers
+ * to the next and the previous items in the list, respectively.  Note that
+ * they do not perform additional checks for the validity of these pointers,
+ * so they have to be guarded with respective list_head/list_tail checks in case
+ * of lists with designated heads (where the list's head is not embedded withing
+ * a list item.
+ *
+ * list_{insert,append,remove,remove_tail,remove_head,replace} provide some
+ * basic means of list manipulation.
+ *
+ * list_foreach() and list_foreach_safe() are wrapper macros for simplifying
+ * iteration over a list, with the latter having an additional argument
+ * for storing temporary pointer, thus allowing list manipulations during
+ * its iteration.
+ *
+ * A simple example:
+ *
+ *     struct my_struct {
+ *             int a;
+ *             struct list_item l1;
+ *             struct list_item l2;
+ *     };
+ *
+ *     EMPTY_LIST(list_1);              <--- Defining a designated head for list
+ *
+ *     struct my_struct *item =
+ *             calloc(1, sizeof(*item));
+ *     list_init(&item->l2);            <--- Initialising structure field that
+ *                                           is used for lists without designated
+ *                                           head.
+ *     list_insert(&list_1, &item->l1); <--- Inserting an item into the list
+ *
+ *     item = calloc(1, sizeof(*item));
+ *     list_init(&item->l2);
+ *
+ *     list_append(&(list_head(list_1, struct my_struct, l1)->l2), &item->l2);
+ *
+ *     struct my_struct *cur = item;    <--- Iteration over a headless list
+ *     do {
+ *             printf("%d\n", cur->a);
+ *     } while ((cur = list_next(&cur, l2)) != item);
+ *
+ *     struct my_struct *i;
+ *     list_foreach(i, list_1, l1) {    <--- Iteration over list_1 without list
+ *             printf("%d\n", i->a);         modification
+ *     }
+ *
+ *     struct my_struct *tmp;           <--- Iteration with modification
+ *     list_foreach_safe(i, list_1, l1, tmp) {
+ *             list_remove(&i->l1);
+ *             free(i);
+ *     }
+ *
+ * See also:
+ *     "Linux kernel design patterns - part 2", section "Linked Lists"
+ *     https://lwn.net/Articles/336255/
+ */
+
+#include "macros.h"
+
+struct list_item {
+	struct list_item *prev;
+	struct list_item *next;
+};
+
+/**
+ * Define an empty list head.
+ *
+ * @param l_ List head variable name.
+ */
+#define EMPTY_LIST(l_) struct list_item l_ = { &l_, &l_ }
+
+/** Initialise an empty list. */
+static inline void
+list_init(struct list_item *l)
+{
+	l->prev = l;
+	l->next = l;
+}
+
+/** Check whether list is empty. */
+static inline bool
+list_is_empty(const struct list_item *l)
+{
+	return ((l->next == l) && (l->prev == l))
+		/*
+		 * XXX This could be the case when struct list_item hasn't been
+		 *     initialised at all; we should probably also call some
+		 *     errror_func_msg() in that case, as it looks like sloppy
+		 *     programming.
+		 */
+		|| (!l->next && !l->prev);
+}
+
+/**
+ * Convert a pointer to a struct list_item to a pointer to a list item.
+ *
+ * @param var   Pointer to struct list_item.
+ * @param type  Type of the list's item.
+ * @param field Name of the field that holds the respective struct list_item.
+ */
+#define list_elem(var, type, field) containerof((var), type, field)
+
+/**
+ * Get the first element in a list.
+ *
+ * @param head  Pointer to the list's head.
+ * @param type  Type of the list's item.
+ * @param field Name of the field that holds the respective struct list_item.
+ */
+#define list_head(head, type, field) \
+	(list_is_empty(head) ? NULL : list_elem((head)->next, type, field))
+/**
+ * Get the last element in a list.
+ *
+ * @param head  Pointer to the list's head.
+ * @param type  Type of the list's item.
+ * @param field Name of the field that holds the respective struct list_item.
+ */
+#define list_tail(head, type, field) \
+	(list_is_empty(head) ? NULL : list_elem((head)->prev, type, field))
+
+/**
+ * Get the next element in a list.
+ *
+ * @param var   Pointer to a list item.
+ * @param field Name of the field that holds the respective struct list_item.
+ */
+#define list_next(var, field) \
+	list_elem((var)->field.next, typeof(*(var)), field)
+/**
+ * Get the previous element in a list.
+ *
+ * @param var   Pointer to a list item.
+ * @param field Name of the field that holds the respective struct list_item.
+ */
+#define list_prev(var, field) \
+	list_elem((var)->field.prev, typeof(*(var)), field)
+
+/**
+ * Insert an item into a list. The item is placed as the next list item
+ * to the head.
+ */
+static inline void
+list_insert(struct list_item *head, struct list_item *item)
+{
+	item->next = head->next;
+	item->prev = head;
+	head->next->prev = item;
+	head->next = item;
+}
+
+/**
+ * Insert an item into a list. The item is placed as the previous list item
+ * to the head.
+ */
+static inline void
+list_append(struct list_item *head, struct list_item *item)
+{
+	item->next = head;
+	item->prev = head->prev;
+	head->prev->next = item;
+	head->prev = item;
+}
+
+/**
+ * Remove an item from a list.
+ *
+ * @param item Pointer to struct list_item of the item to be removed.
+ * @return     Whether the action has been performed.
+ */
+static inline bool
+list_remove(struct list_item *item)
+{
+	if (!item->next || !item->prev || list_is_empty(item))
+		return false;
+
+	item->prev->next = item->next;
+	item->next->prev = item->prev;
+	item->next = item->prev = item;
+
+	return true;
+}
+
+/**
+ * Remove the last element of a list.
+ *
+ * @param head Pointer to the list's head.
+ * @return     Pointer to struct list_item removed from the list;
+ *             or NULL, if the list is empty.
+ */
+static inline struct list_item *
+list_remove_tail(struct list_item *head)
+{
+	struct list_item *t = list_is_empty(head) ? NULL : head->prev;
+
+	if (t)
+		list_remove(t);
+
+	return t;
+}
+
+/**
+ * Remove the first element of a list.
+ *
+ * @param head Pointer to the list's head.
+ * @return     Pointer to struct list_item removed from the list;
+ *             or NULL, if the list is empty.
+ */
+static inline struct list_item *
+list_remove_head(struct list_item *head)
+{
+	struct list_item *h = list_is_empty(head) ? NULL : head->next;
+
+	if (h)
+		list_remove(h);
+
+	return h;
+}
+
+/**
+ * Replace an old struct list_item in a list with the new one.
+ *
+ * @param old Pointer to struct list_item of the item to be replaced.
+ * @param new Pointer to struct list_item of the item to be replaced with.
+ * @return    Whether the replacement has been performed.
+ */
+static inline bool
+list_replace(struct list_item *old, struct list_item *new)
+{
+	if (!old->next || !old->prev || list_is_empty(old))
+		return false;
+
+	new->next = old->next;
+	new->prev = old->prev;
+	old->prev->next = new;
+	old->next->prev = new;
+	old->next = old->prev = old;
+
+	return true;
+}
+
+/**
+ * List iteration wrapper for non-destructive operations.
+ *
+ * @param var_   Variable holding pointer to a current list item.
+ * @param head_  Pointer to the list's head.
+ * @param field_ Name of the field containing the respective struct list_item
+ *               inside list items.
+ */
+#define list_foreach(var_, head_, field_) \
+	for (var_ = list_elem((head_)->next, typeof(*var_), field_); \
+	    &(var_->field_) != (head_); var_ = list_next(var_, field_))
+
+/**
+ * List iteration wrapper for destructive operations.
+ *
+ * @param var_   Variable holding pointer to a current list item.
+ * @param head_  Pointer to the list's head.
+ * @param field_ Name of the field containing the respective struct list_item
+ *               inside list items.
+ * @param _tmp   Temporary variable for storing pointer to the next item.
+ */
+#define list_foreach_safe(var_, head_, field_, _tmp) \
+	for (var_ = list_elem((head_)->next, typeof(*var_), field_), \
+	    _tmp = list_elem((var_)->field_.next, typeof(*var_), field_); \
+	    &var_->field_ != head_; var_ = _tmp, _tmp = list_next(_tmp, field_))
+
+#endif /* !STRACE_LIST_H */
+diff --git a/macros.h b/macros.h
+index 9346d90..6951928 100644
+--- a/macros.h
+++ b/macros.h
+@@ -33,6 +33,25 @@
+ 	(offsetof(type_, member_) + sizeof(((type_ *)0)->member_))
+ #endif
+ 
+#ifndef cast_ptr
+# define cast_ptr(type_, var_)	\
+	((type_) (uintptr_t) (const volatile void *) (var_))
+#endif
+
+#ifndef containerof
+/**
+ * Return a pointer to a structure that contains the provided variable.
+ *
+ * @param ptr_    Pointer to data that is a field of the container structure.
+ * @param struct_ Type of the container structure.
+ * @param member_ Name of the member field.
+ * @return  Pointer to the container structure.
+ */
+# define containerof(ptr_, struct_, member_)	\
+	cast_ptr(struct_ *,			\
+		 (const volatile char *) (ptr_) - offsetof(struct_, member_))
+#endif
+
+ static inline bool
+ is_filled(const char *ptr, char fill, size_t size)
+ {
+-- 
+2.1.4
+
--- a/SOURCES/strace-rhbz1610774-0003-Implement-queueing-of-threads-before-dispatching-the.patch
+++ b/SOURCES/strace-rhbz1610774-0003-Implement-queueing-of-threads-before-dispatching-the.patch
@ -1,30 +1,39 @@
-From c527f21b7528e14b13d2be13acf5c42359e94021 Mon Sep 17 00:00:00 2001
+From 496f922dad9b58b891f417b937ac5fb0b0a8649a Mon Sep 17 00:00:00 2001
 From: Eugene Syromyatnikov <evgsyr@gmail.com>
 Date: Wed, 8 Aug 2018 21:41:39 +0200
-Subject: [PATCH 3/3] Implement queueing of threads before dispatching them
+Subject: [PATCH 27/27] Implement queueing of threads before dispatching them

 It is possible that some tracees call a lot of cheap syscalls too fast,
-and that can lead to starvation to the point some tracees are not served
-for indefinite amount of time.  In order to solve that unfairness, try
+and that can stress the tracer to the point some tracees are not served
+for indefinite amount of time.  In order to avoid that unfairness, try
 to collect all the pending tracees first along with the relevant
 information and only then dispatch the events.

 * defs.h: Include "list.h".
-(struct tcb): Add wait_data_idx and wait_list fields.
+(struct tcb): Add wait_data_idx, delayed_wait_data, and wait_list
+fields.
 * strace.c (struct tcb_wait_data): Add "msg" field.
-(tcb_wait_tab): New static variable.
-(expand_tcbtab): Resize tcb_wait_tab along with tcbtab, provide
-an additional slot for extra event.
+(tcb_wait_tab, tcb_wait_tab_size): New static variables.
+(alloctcb): Initialize wait_list.
 (droptcb): Remove tcp from wait_list.
 (maybe_switch_tcbs): Get old pid from
-tcb_wait_tab[tcp->wait_data_idx].msg.
+tcb_wait_tab[tcp->wait_data_idx].msg instead of calling
+ptrace(PTRACE_GETEVENTMSG).
+(trace_wait_data_size, init_trace_wait_data, copy_trace_wait_data,
+free_trace_wait_data, tcb_wait_tab_check_size): New functions, in order
+to allow the code outside next_event to operate with wait_data as with
+an opaque object (needed for dispatch_event and restart_delayed_tcb).
 (next_event): Add pending_tcps, extra_tcp, wait_nohang, elem, and
 wait_tab_pos variables; check for elements in pending_tcps and skip
 waiting if the list is not empty; check for extra_tcp and skip waiting
 along with swapping wait_data_idx with wait_extra_data_idx;
-after the initial wait, call wait4() in loop with WNOHANG flag set;
+after the initial wait4(), call wait4() in loop with WNOHANG flag set;
 fetch siginfo on signal and eventmsg on PTRACE_EVENT_EXEC;
 return the first tcp in pending_tcps list.
+(dispatch_event): Store a pointer to a copy of tcb_wait_data in
+tcp->delayed_wait_data if tcp's restart has to be delayed.
+(restart_delayed_tcb): Use tcp->delayed_wait_data, create a stub
+tcb_wait_data if it is NULL, free temporary trace_wait_data.
 * tests/Makefile.am (XFAIL_TEST): Remove looping_threads.test.

 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=478419
@ -37,45 +46,51 @@ Co-Authored-by: Denys Vlasenko <dvlasenk@redhat.com>
 Co-Authored-by: Andreas Schwab <aschwab@redhat.com>
 Co-Authored-by: Jeff Law <law@redhat.com>
 Co-Authored-by: DJ Delorie <dj@redhat.com>
---
- defs.h            |  10 ++
- strace.c          | 321 ++++++++++++++++++++++++++++++++++--------------------
- tests/Makefile.am |   3 +-
- 3 files changed, 212 insertions(+), 122 deletions(-)

-Index: strace-4.24/defs.h
-===================================================================
--- strace-4.24.orig/defs.h	2018-09-12 23:52:48.978021943 +0200
-+++ strace-4.24/defs.h	2018-09-12 23:53:35.764480931 +0200
-@@ -57,6 +57,7 @@
+Conflicts:
+	defs.h
+	tests/Makefile.am
+---
+ defs.h            |  12 ++
+ strace.c          | 393 +++++++++++++++++++++++++++++++++++++-----------------
+ tests/Makefile.am |   3 +-
+ 3 files changed, 283 insertions(+), 125 deletions(-)
+
+diff --git a/defs.h b/defs.h
+index 811bb0d..2a614a7 100644
+--- a/defs.h
+++ b/defs.h
+@@ -36,6 +36,7 @@
+ #include "arch_defs.h"
 #include "error_prints.h"
 #include "gcc_compat.h"
- #include "kernel_types.h"
 +#include "list.h"
+ #include "kernel_types.h"
 #include "macros.h"
 #include "mpers_type.h"
- #include "string_to_uint.h"
-@@ -236,6 +237,15 @@
+@@ -218,6 +219,17 @@ struct tcb {
 
 	struct mmap_cache_t *mmap_cache;
 
 +	/*
 +	 * Data that is stored during process wait traversal.
 +	 * We use indices as the actual data is stored in an array
-+	 * that is realloc'ed in runtime.
+	 * that is realloc'ed at runtime.
 +	 */
 +	size_t wait_data_idx;
+	/** Wait data storage for a delayed process. */
+	struct tcb_wait_data *delayed_wait_data;
 +	struct list_item wait_list;
 +
 +
 #ifdef HAVE_LINUX_KVM_H
 	struct vcpu_info *vcpu_info_list;
 #endif
-Index: strace-4.24/strace.c
-===================================================================
--- strace-4.24.orig/strace.c	2018-09-12 23:53:30.371543291 +0200
-+++ strace-4.24/strace.c	2018-09-12 23:53:35.765480919 +0200
-@@ -161,10 +161,17 @@
+diff --git a/strace.c b/strace.c
+index 0745838..0914dc7 100644
+--- a/strace.c
+++ b/strace.c
+@@ -141,6 +141,7 @@ static struct tcb *current_tcp;
 struct tcb_wait_data {
 	enum trace_event te; /**< Event passed to dispatch_event() */
 	int status;          /**< status, returned by wait4() */
@ -83,27 +98,26 @@ Index: strace-4.24/strace.c
 	siginfo_t si;        /**< siginfo, returned by PTRACE_GETSIGINFO */
 };
 
- static struct tcb **tcbtab;
-+/*
-+ * Since the queueing of tracees stops as soon as wait4() returns EAGAIN,
-+ * or at least two events for a single tracee, tab_wait_tab size shouldn't
-+ * exceed tcbtabsize + 1.
-+ */
-+static struct tcb_wait_data *tcb_wait_tab;
+@@ -148,6 +149,10 @@ static struct tcb **tcbtab;
 static unsigned int nprocs;
 static size_t tcbtabsize;
 
-@@ -750,6 +757,9 @@
- 	for (tcb_ptr = tcbtab + old_tcbtabsize;
- 	    tcb_ptr < tcbtab + tcbtabsize; tcb_ptr++, newtcbs++)
- 		*tcb_ptr = newtcbs;
+static struct tcb_wait_data *tcb_wait_tab;
+static size_t tcb_wait_tab_size;
 +
-+	tcb_wait_tab = xreallocarray(tcb_wait_tab, sizeof(*tcb_wait_tab),
-+				     tcbtabsize + 1);
- }
- 
- static struct tcb *
-@@ -853,6 +863,8 @@
+
+ #ifndef HAVE_PROGRAM_INVOCATION_NAME
+ char *program_invocation_name;
+ #endif
+@@ -745,6 +750,7 @@ alloctcb(int pid)
+ 		tcp = tcbtab[i];
+ 		if (!tcp->pid) {
+ 			memset(tcp, 0, sizeof(*tcp));
+			list_init(&tcp->wait_list);
+ 			tcp->pid = pid;
+ #if SUPPORTED_PERSONALITIES > 1
+ 			tcp->currpers = current_personality;
+@@ -833,6 +839,8 @@ droptcb(struct tcb *tcp)
 	if (printing_tcp == tcp)
 		printing_tcp = NULL;
 
@ -112,7 +126,7 @@ Index: strace-4.24/strace.c
 	memset(tcp, 0, sizeof(*tcp));
 }
 
-@@ -2071,10 +2083,8 @@
+@@ -2051,10 +2059,8 @@ maybe_switch_tcbs(struct tcb *tcp, const int pid)
 {
 	FILE *fp;
 	struct tcb *execve_thread;
@ -124,18 +138,63 @@ Index: strace-4.24/strace.c
 	/* Avoid truncation in pid2tcb() param passing */
 	if (old_pid <= 0 || old_pid == pid)
 		return tcp;
-@@ -2235,17 +2245,27 @@
- static const struct tcb_wait_data *
- next_event(void)
+@@ -2207,20 +2213,74 @@ print_event_exit(struct tcb *tcp)
+ 	line_ended();
+ }
+ 
+-static const struct tcb_wait_data *
+-next_event(void)
+static size_t
+trace_wait_data_size(struct tcb *tcp)
 {
 -	static struct tcb_wait_data wait_data;
-
+	return sizeof(struct tcb_wait_data);
+}
+ 
 -	int pid;
 -	int status;
 -	struct tcb *tcp;
 -	struct tcb_wait_data *wd = &wait_data;
 -	struct rusage ru;
-
+static struct tcb_wait_data *
+init_trace_wait_data(void *p)
+{
+	struct tcb_wait_data *wd = p;
+
+	memset(wd, 0, sizeof(*wd));
+
+	return wd;
+}
+ 
+static struct tcb_wait_data *
+copy_trace_wait_data(const struct tcb_wait_data *wd)
+{
+	struct tcb_wait_data *new_wd = xmalloc(sizeof(*new_wd));
+
+	memcpy(new_wd, wd, sizeof(*wd));
+
+	return new_wd;
+}
+
+static void
+free_trace_wait_data(struct tcb_wait_data *wd)
+{
+	free(wd);
+}
+
+static void
+tcb_wait_tab_check_size(const size_t size)
+{
+	while (size >= tcb_wait_tab_size) {
+		tcb_wait_tab = xgrowarray(tcb_wait_tab,
+					  &tcb_wait_tab_size,
+					  sizeof(tcb_wait_tab[0]));
+	}
+}
+
+static const struct tcb_wait_data *
+next_event(void)
+{
 	if (interrupted)
 		return NULL;
 
@ -143,11 +202,13 @@ Index: strace-4.24/strace.c
 +	struct list_item *elem;
 +
 +	static EMPTY_LIST(pending_tcps);
+	/* Handle the queued tcbs before waiting for new events.  */
 +	if (!list_is_empty(&pending_tcps))
 +		goto next_event_get_tcp;
 +
 +	static struct tcb *extra_tcp;
 +	static size_t wait_extra_data_idx;
+	/* Handle the extra tcb event.  */
 +	if (extra_tcp) {
 +		tcp = extra_tcp;
 +		extra_tcp = NULL;
@ -160,7 +221,7 @@ Index: strace-4.24/strace.c
 	/*
 	 * Used to exit simply when nprocs hits zero, but in this testcase:
 	 *  int main(void) { _exit(!!fork()); }
-@@ -2287,8 +2307,10 @@
+@@ -2262,8 +2322,10 @@ next_event(void)
 	 * then the system call will be interrupted and
 	 * the expiration will be handled by the signal handler.
 	 */
@ -173,7 +234,7 @@ Index: strace-4.24/strace.c
 
 	/*
 	 * The window of opportunity to handle expirations
-@@ -2304,135 +2326,194 @@
+@@ -2279,135 +2341,202 @@ next_event(void)
 			return NULL;
 	}
 
@ -184,6 +245,11 @@ Index: strace-4.24/strace.c
 +	size_t wait_tab_pos = 0;
 +	bool wait_nohang = false;
 +
+	/*
+	 * Wait for new events until wait4() returns 0 (meaning that there's
+	 * nothing more to wait for for now), or a second event for some tcb
+	 * appears (which may happen if a tracee was SIGKILL'ed, for example).
+	 */
 +	for (;;) {
 +		struct tcb_wait_data *wd;
 +
@ -244,7 +310,7 @@ Index: strace-4.24/strace.c
 -			return wd;
 +			tcp = maybe_allocate_tcb(pid, status);
 +			if (!tcp)
-+				break;
+				goto next_event_wait_next;
 		}
 -	}
 
@ -257,16 +323,28 @@ Index: strace-4.24/strace.c
 +			ts_sub(&tcp->dtime, &stime, &tcp->stime);
 +			tcp->stime = stime;
 +		}
-+
-+		if (wait_tab_pos > tcbtabsize)
-+			error_func_msg_and_die("Wait data storage overflow "
-+					       "(wait_tab_pos %zu, nprocs %u, "
-+					       "tcbtabsize %zu)", wait_tab_pos,
-+					       nprocs, tcbtabsize);
-+
+ 
+-	/* Set current output file */
+-	set_current_tcp(tcp);
+		tcb_wait_tab_check_size(wait_tab_pos);
+ 
+-	if (cflag) {
+-		struct timespec stime = {
+-			.tv_sec = ru.ru_stime.tv_sec,
+-			.tv_nsec = ru.ru_stime.tv_usec * 1000
+-		};
+-		ts_sub(&tcp->dtime, &stime, &tcp->stime);
+-		tcp->stime = stime;
+-	}
+		/* Initialise a new wait data structure.  */
 +		wd = tcb_wait_tab + wait_tab_pos;
-+		memset(wd, 0, sizeof(*wd));
-+
+		init_trace_wait_data(wd);
+		wd->status = status;
+ 
+-	if (WIFSIGNALED(status)) {
+-		wd->te = TE_SIGNALLED;
+-		return wd;
+-	}
 +		if (WIFSIGNALED(status)) {
 +			wd->te = TE_SIGNALLED;
 +		} else if (WIFEXITED(status)) {
@ -278,19 +356,12 @@ Index: strace-4.24/strace.c
 +			 * that remains is WIFSTOPPED(status).
 +			 */
 
-	/* Set current output file */
-	set_current_tcp(tcp);
+-	if (WIFEXITED(status)) {
+-		wd->te = TE_EXITED;
+-		return wd;
 +			const unsigned int sig = WSTOPSIG(status);
 +			const unsigned int event = (unsigned int) status >> 16;
- 
-	if (cflag) {
-		struct timespec stime = {
-			.tv_sec = ru.ru_stime.tv_sec,
-			.tv_nsec = ru.ru_stime.tv_usec * 1000
-		};
-		ts_sub(&tcp->dtime, &stime, &tcp->stime);
-		tcp->stime = stime;
-	}
+
 +			switch (event) {
 +			case 0:
 +				/*
@ -319,11 +390,7 @@ Index: strace-4.24/strace.c
 +					 */
 +					bool stopped = ptrace(PTRACE_GETSIGINFO,
 +						pid, 0, &wd->si) < 0;
- 
-	if (WIFSIGNALED(status)) {
-		wd->te = TE_SIGNALLED;
-		return wd;
-	}
+
 +					wd->te = stopped ? TE_GROUP_STOP
 +							 : TE_SIGNAL_DELIVERY_STOP;
 +				}
@ -353,10 +420,7 @@ Index: strace-4.24/strace.c
 +				if (ptrace(PTRACE_GETEVENTMSG, pid, NULL,
 +				    &wd->msg) < 0)
 +					wd->msg = 0;
- 
-	if (WIFEXITED(status)) {
-		wd->te = TE_EXITED;
-		return wd;
+
 +				wd->te = TE_STOP_BEFORE_EXECVE;
 +				break;
 +			case PTRACE_EVENT_EXIT:
@ -367,7 +431,11 @@ Index: strace-4.24/strace.c
 +			}
 +		}
 +
-+		if (tcp->wait_list.next) {
+		if (!wd->te)
+			error_func_msg("Tracing event hasn't been determined "
+				       "for pid %d, status %0#x", pid, status);
+
+		if (!list_is_empty(&tcp->wait_list)) {
 +			wait_extra_data_idx = wait_tab_pos;
 +			extra_tcp = tcp;
 +			debug_func_msg("queued extra pid %d", tcp->pid);
@ -377,12 +445,12 @@ Index: strace-4.24/strace.c
 +			debug_func_msg("queued pid %d", tcp->pid);
 +		}
 +
-+		wd->status = status;
 +		wait_tab_pos++;
 +
 +		if (extra_tcp)
 +			break;
 +
+next_event_wait_next:
 +		pid = wait4(-1, &status, __WALL | WNOHANG, (cflag ? &ru : NULL));
 +		wait_errno = errno;
 +		wait_nohang = true;
@ -397,15 +465,16 @@ Index: strace-4.24/strace.c
 +	elem = list_remove_head(&pending_tcps);
 +
 +	if (!elem) {
+		tcb_wait_tab_check_size(0);
 +		memset(tcb_wait_tab, 0, sizeof(*tcb_wait_tab));
 +		tcb_wait_tab->te = TE_NEXT;
-+
+ 
 +		return tcb_wait_tab;
 +	} else {
 +		tcp = list_elem(elem, struct tcb, wait_list);
 +		debug_func_msg("dequeued pid %d", tcp->pid);
 +	}
- 
+
 +next_event_exit:
 	/* Is this the very first time we see this tracee stopped? */
 	if (tcp->flags & TCB_STARTUP)
@ -475,11 +544,59 @@ Index: strace-4.24/strace.c
 }
 
 static int
-Index: strace-4.24/tests/Makefile.am
-===================================================================
--- strace-4.24.orig/tests/Makefile.am	2018-09-12 23:53:31.739527473 +0200
-+++ strace-4.24/tests/Makefile.am	2018-09-12 23:53:35.765480919 +0200
-@@ -367,8 +367,7 @@
+@@ -2569,8 +2698,15 @@ dispatch_event(const struct tcb_wait_data *wd)
+ 		return false;
+ 
+ 	/* If the process is being delayed, do not ptrace_restart just yet */
+-	if (syscall_delayed(current_tcp))
+	if (syscall_delayed(current_tcp)) {
+		if (current_tcp->delayed_wait_data)
+			error_func_msg("pid %d has delayed wait data set"
+				       " already", current_tcp->pid);
+
+		current_tcp->delayed_wait_data = copy_trace_wait_data(wd);
+
+ 		return true;
+	}
+ 
+ 	if (ptrace_restart(restart_op, current_tcp, restart_sig) < 0) {
+ 		/* Note: ptrace_restart emitted error message */
+@@ -2583,7 +2719,15 @@ dispatch_event(const struct tcb_wait_data *wd)
+ static bool
+ restart_delayed_tcb(struct tcb *const tcp)
+ {
+-	const struct tcb_wait_data wd = { .te = TE_RESTART };
+	struct tcb_wait_data *wd = tcp->delayed_wait_data;
+
+	if (!wd) {
+		error_func_msg("No delayed wait data found for pid %d",
+			       tcp->pid);
+		wd = init_trace_wait_data(alloca(trace_wait_data_size(tcp)));
+	}
+
+	wd->te = TE_RESTART;
+ 
+ 	debug_func_msg("pid %d", tcp->pid);
+ 
+@@ -2591,9 +2735,12 @@ restart_delayed_tcb(struct tcb *const tcp)
+ 
+ 	struct tcb *const prev_tcp = current_tcp;
+ 	current_tcp = tcp;
+-	bool ret = dispatch_event(&wd);
+	bool ret = dispatch_event(wd);
+ 	current_tcp = prev_tcp;
+ 
+	free_trace_wait_data(tcp->delayed_wait_data);
+	tcp->delayed_wait_data = NULL;
+
+ 	return ret;
+ }
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index de7a3d2..51f00a9 100644
+--- a/tests/Makefile.am
+++ b/tests/Makefile.am
+@@ -350,8 +350,7 @@ XFAIL_TESTS_m32 = $(STACKTRACE_TESTS)
 XFAIL_TESTS_mx32 = $(STACKTRACE_TESTS)
 XFAIL_TESTS_x86_64 = int_0x80.gen.test
 XFAIL_TESTS_x32 = int_0x80.gen.test
@ -489,3 +606,6 @@ Index: strace-4.24/tests/Makefile.am
 
 TEST_LOG_COMPILER = env
 AM_TEST_LOG_FLAGS = STRACE_ARCH=$(ARCH) STRACE_NATIVE_ARCH=$(NATIVE_ARCH) \
+-- 
+2.1.4
+
--- a/SOURCES/0028-Wire-up-rseq-syscall-on-architectures-that-use-gener.patch
+++ b/SOURCES/0028-Wire-up-rseq-syscall-on-architectures-that-use-gener.patch
@ -0,0 +1,37 @@
+From 0b051a218d5e7e51677c26c691dcf619a7d894e9 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Mon, 11 Feb 2019 23:35:07 +0000
+Subject: [PATCH] Wire up rseq syscall on architectures that use generic
+ unistd.h
+
+* linux/32/syscallent.h [293]: Wire up rseq syscall introduced by linux
+commit v4.19-rc1~109^2~47.
+* linux/64/syscallent.h [293]: Likewise.
+* NEWS: Mention this.
+---
+ NEWS                  | 2 ++
+ linux/32/syscallent.h | 1 +
+ linux/64/syscallent.h | 1 +
+ 3 files changed, 4 insertions(+)
+
+Index: strace-4.24/linux/32/syscallent.h
+===================================================================
+--- strace-4.24.orig/linux/32/syscallent.h	2019-06-13 01:05:32.297055881 +0200
+++ strace-4.24/linux/32/syscallent.h	2019-06-13 01:05:42.887824722 +0200
+@@ -283,6 +283,7 @@
+ [290] = { 1,	0,		SEN(pkey_free),			"pkey_free"		},
+ [291] = { 5,	TD|TF|TSTA,	SEN(statx),			"statx"			},
+ [292] = { 6,	0,		SEN(io_pgetevents),		"io_pgetevents"		},
+[293] = { 4,	0,		SEN(rseq),			"rseq"			},
+ 
+ #undef sys_ARCH_mmap
+ #undef ARCH_WANT_SYNC_FILE_RANGE2
+Index: strace-4.24/linux/64/syscallent.h
+===================================================================
+--- strace-4.24.orig/linux/64/syscallent.h	2019-06-13 01:05:32.297055881 +0200
+++ strace-4.24/linux/64/syscallent.h	2019-06-13 01:05:42.888824700 +0200
+@@ -276,3 +276,4 @@
+ [290] = { 1,	0,		SEN(pkey_free),			"pkey_free"		},
+ [291] = { 5,	TD|TF|TSTA,	SEN(statx),			"statx"			},
+ [292] = { 6,	0,		SEN(io_pgetevents),		"io_pgetevents"		},
+[293] = { 4,	0,		SEN(rseq),			"rseq"			},
--- a/SOURCES/0029-Wire-up-kexec_file_load-syscall-on-architectures-tha.patch
+++ b/SOURCES/0029-Wire-up-kexec_file_load-syscall-on-architectures-tha.patch
@ -0,0 +1,39 @@
+From 898f0ad0bc498c45734bc95917b74cfdc6466c26 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Mon, 11 Feb 2019 23:35:07 +0000
+Subject: [PATCH] Wire up kexec_file_load syscall on architectures that use
+ generic unistd.h
+
+* linux/32/syscallent.h [294]: Wire up kexec_file_load syscall
+introduced by linux commit v5.0-rc1~35^2~41^2~15.
+* linux/64/syscallent.h [294]: Likewise.
+* NEWS: Mention this.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1676045
+---
+ NEWS                  | 2 +-
+ linux/32/syscallent.h | 1 +
+ linux/64/syscallent.h | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+Index: strace-4.24/linux/32/syscallent.h
+===================================================================
+--- strace-4.24.orig/linux/32/syscallent.h	2019-06-13 01:05:42.887824722 +0200
+++ strace-4.24/linux/32/syscallent.h	2019-06-13 01:06:00.405442367 +0200
+@@ -284,6 +284,7 @@
+ [291] = { 5,	TD|TF|TSTA,	SEN(statx),			"statx"			},
+ [292] = { 6,	0,		SEN(io_pgetevents),		"io_pgetevents"		},
+ [293] = { 4,	0,		SEN(rseq),			"rseq"			},
+[294] = { 5,	TD,		SEN(kexec_file_load),		"kexec_file_load"	},
+ 
+ #undef sys_ARCH_mmap
+ #undef ARCH_WANT_SYNC_FILE_RANGE2
+Index: strace-4.24/linux/64/syscallent.h
+===================================================================
+--- strace-4.24.orig/linux/64/syscallent.h	2019-06-13 01:05:42.888824700 +0200
+++ strace-4.24/linux/64/syscallent.h	2019-06-13 01:06:00.405442367 +0200
+@@ -277,3 +277,4 @@
+ [291] = { 5,	TD|TF|TSTA,	SEN(statx),			"statx"			},
+ [292] = { 6,	0,		SEN(io_pgetevents),		"io_pgetevents"		},
+ [293] = { 4,	0,		SEN(rseq),			"rseq"			},
+[294] = { 5,	TD,		SEN(kexec_file_load),		"kexec_file_load"	},
--- a/SOURCES/0030-limit-qual_fault-test-on-aarch64.patch
+++ b/SOURCES/0030-limit-qual_fault-test-on-aarch64.patch
@ -0,0 +1,42 @@
+Limit the scope of qual_fault.tests on aarch64 as otherwise it takes
+unacceptable amount of time on available builders (more than an hour).
+Index: strace-4.24/tests/qual_fault.test
+===================================================================
+--- strace-4.24.orig/tests/qual_fault.test	2019-06-13 17:37:10.708269613 +0200
+++ strace-4.24/tests/qual_fault.test	2019-06-13 17:41:29.358829506 +0200
+@@ -75,18 +75,32 @@
+ 	done
+ }
+ 
+-for err in '' ENOSYS 22 einval; do
+
+case "$STRACE_ARCH" in
+	aarch64)
+	NUMBERS1='2'
+	NUMBERS2='3'
+	ERRS='EnoSys 22'
+	;;
+	*)
+	ERRS='ENOSYS 22 einval'
+	NUMBERS1='1 2 3 5 7 11'
+	NUMBERS2='1 2 3 5 7 11'
+	;;
+esac
+
+for err in '' $(echo $ERRS); do
+ 	for fault in writev desc,51; do
+ 		check_fault_injection \
+ 			writev $fault "$err" '' '' 1 -efault=chdir
+ 		check_fault_injection \
+ 			writev $fault "$err" '' '' 1 -efault=chdir -efault=none
+-		for F in 1 2 3 5 7 11; do
+		for F in $(echo $NUMBERS1); do
+ 			check_fault_injection \
+ 				writev $fault "$err" $F '' 1
+ 			check_fault_injection \
+ 				writev $fault "$err" $F + 1
+-			for S in 1 2 3 5 7 11; do
+			for S in $(echo $NUMBERS2); do
+ 				check_fault_injection \
+ 					writev $fault "$err" $F $S 1
+ 				check_fault_injection \
--- a/SOURCES/0031-avoid-zero-length-VLA-in-evdev_c.patch
+++ b/SOURCES/0031-avoid-zero-length-VLA-in-evdev_c.patch
@ -0,0 +1,62 @@
+Index: strace-4.24/evdev.c
+===================================================================
+--- strace-4.24.orig/evdev.c	2019-06-13 23:42:43.294304862 +0200
+++ strace-4.24/evdev.c	2019-06-13 23:43:35.588294946 +0200
+@@ -143,6 +143,14 @@
+ 	return RVAL_IOCTL_DECODED;
+ }
+ 
+# ifndef ROUNDUP_DIV
+#  define ROUNDUP_DIV(val_, div_) (((val_) + (div_) - 1) / (div_))
+# endif
+
+# ifndef ROUNDUP
+#  define ROUNDUP(val_, div_) (ROUNDUP_DIV((val_), (div_)) * (div_))
+# endif
+
+ static int
+ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
+ 	       const struct xlat decode_nr[], const unsigned int max_nr,
+@@ -151,25 +159,36 @@
+ 	tprints(", ");
+ 
+ 	unsigned int size;
+-	if ((kernel_ulong_t) tcp->u_rval > max_nr / 8)
+-		size = max_nr;
+	unsigned int size_bits;
+
+	if ((kernel_ulong_t) tcp->u_rval > max_nr / CHAR_BIT)
+		size_bits = max_nr;
+ 	else
+-		size = tcp->u_rval * 8;
+		size_bits = tcp->u_rval * CHAR_BIT;
+
+	size = ROUNDUP(ROUNDUP_DIV(size_bits, CHAR_BIT), current_wordsize);
+
+	if (syserror(tcp) || !size) {
+		printaddr(arg);
+
+		return RVAL_IOCTL_DECODED;
+	}
+
+ 	char decoded_arg[size];
+ 
+-	if (umove_or_printaddr(tcp, arg, &decoded_arg))
+	if (umoven_or_printaddr(tcp, arg, size, decoded_arg))
+ 		return RVAL_IOCTL_DECODED;
+ 
+ 	tprints("[");
+ 
+ 	int bit_displayed = 0;
+-	int i = next_set_bit(decoded_arg, 0, size);
+	int i = next_set_bit(decoded_arg, 0, size_bits);
+ 	if (i < 0) {
+ 		tprints(" 0 ");
+ 	} else {
+ 		printxval_dispatch(decode_nr, decode_nr_size, i, dflt, xt);
+ 
+-		while ((i = next_set_bit(decoded_arg, i + 1, size)) > 0) {
+		while ((i = next_set_bit(decoded_arg, i + 1, size_bits)) > 0) {
+ 			if (abbrev(tcp) && bit_displayed >= 3) {
+ 				tprints(", ...");
+ 				break;
--- a/SOURCES/strace-rhbz1610774-0001-tests-check-tracing-of-looping-threads.patch
+++ b/SOURCES/strace-rhbz1610774-0001-tests-check-tracing-of-looping-threads.patch
@ -1,299 +0,0 @@
-From 1e497a53b82bae846618e3b9064d6c4a63024aea Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Wed, 4 Jul 2018 02:11:27 +0000
-Subject: [PATCH 1/3] tests: check tracing of looping threads
-
-* test/many_looping_threads.c: Remove.
-* test/.gitignore: Remove many_looping_threads.
-* test/Makefile (PROGS): Likewise.
-(many_looping_threads): Remove.
-* tests/looping_threads.c: New file.
-* tests/looping_threads.test: New test.
-* tests/.gitignore: Add looping_threads.
-* tests/Makefile.am (check_PROGRAMS): Likewise.
-(looping_threads_LDADD): New variable.
-(MISC_TESTS, XFAIL_TESTS): Add looping_threads.test.
---
- test/.gitignore             |   1 -
- test/Makefile               |   5 +-
- test/many_looping_threads.c |  49 --------------------
- tests/.gitignore            |   1 +
- tests/Makefile.am           |   6 ++-
- tests/looping_threads.c     | 110 ++++++++++++++++++++++++++++++++++++++++++++
- tests/looping_threads.test  |  37 +++++++++++++++
- 7 files changed, 154 insertions(+), 55 deletions(-)
- delete mode 100644 test/many_looping_threads.c
- create mode 100644 tests/looping_threads.c
- create mode 100755 tests/looping_threads.test
-
-Index: strace-4.24/tests/Makefile.am
-===================================================================
--- strace-4.24.orig/tests/Makefile.am	2018-09-12 23:52:54.858953939 +0200
-+++ strace-4.24/tests/Makefile.am	2018-09-13 00:44:12.638097032 +0200
-@@ -127,6 +127,7 @@
- 	ksysent \
- 	list_sigaction_signum \
- 	localtime \
-+	looping_threads \
- 	mmsg-silent \
- 	mmsg_name-v \
- 	msg_control-v \
-@@ -190,6 +191,7 @@
- fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- localtime_LDADD = $(clock_LIBS) $(LDADD)
-+looping_threads_LDADD = -lpthread $(LDADD)
- lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
-@@ -321,6 +323,7 @@
- 	interactive_block.test \
- 	ksysent.test \
- 	localtime.test \
-+	looping_threads.test \
- 	opipe.test \
- 	options-syntax.test \
- 	pc.test \
-@@ -364,7 +367,8 @@
- XFAIL_TESTS_mx32 = $(STACKTRACE_TESTS)
- XFAIL_TESTS_x86_64 = int_0x80.gen.test
- XFAIL_TESTS_x32 = int_0x80.gen.test
-XFAIL_TESTS = $(XFAIL_TESTS_$(MPERS_NAME)) $(XFAIL_TESTS_$(ARCH))
-+XFAIL_TESTS = $(XFAIL_TESTS_$(MPERS_NAME)) $(XFAIL_TESTS_$(ARCH)) \
-+	      looping_threads.test
- 
- TEST_LOG_COMPILER = env
- AM_TEST_LOG_FLAGS = STRACE_ARCH=$(ARCH) STRACE_NATIVE_ARCH=$(NATIVE_ARCH) \
-Index: strace-4.24/tests/looping_threads.c
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.24/tests/looping_threads.c	2018-09-12 23:53:31.739527473 +0200
-@@ -0,0 +1,110 @@
-+/*
-+ * Check tracing of looping threads.
-+ *
-+ * Copyright (c) 2009-2018 The strace developers.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "tests.h"
-+#include <assert.h>
-+#include <errno.h>
-+#include <pthread.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/wait.h>
-+
-+static void *
-+thread(void *arg)
-+{
-+	for (;;)
-+		getuid();
-+	return arg;
-+}
-+
-+int
-+main(int ac, const char *av[])
-+{
-+	assert(ac == 3);
-+
-+	int timeout = atoi(av[1]);
-+	assert(timeout > 0);
-+
-+	int num_threads = atoi(av[2]);
-+	assert(num_threads > 0);
-+
-+	/* Create a new process group.  */
-+	if (setpgid(0, 0))
-+		perror_msg_and_fail("setpgid");
-+
-+	/*
-+	 * When the main process terminates, the process group becomes orphaned.
-+	 * If any member of the orphaned process group is stopped, then
-+	 * a SIGHUP signal followed by a SIGCONT signal is sent to each process
-+	 * in the orphaned process group.
-+	 * Create a process in a stopped state to activate this behaviour.
-+	 */
-+	pid_t stopped = fork();
-+	if (stopped < 0)
-+		perror_msg_and_fail("fork");
-+	if (!stopped) {
-+		raise(SIGSTOP);
-+		_exit(0);
-+	}
-+
-+	const sigset_t set = {};
-+	const struct sigaction act = { .sa_handler = SIG_DFL };
-+	if (sigaction(SIGALRM, &act, NULL))
-+		perror_msg_and_fail("sigaction");
-+	if (sigprocmask(SIG_SETMASK, &set, NULL))
-+		perror_msg_and_fail("sigprocmask");
-+	alarm(timeout);
-+
-+	/*
-+	 * Create all threads in a subprocess, this guarantees that
-+	 * their tracer will not be their parent.
-+	 */
-+	pid_t pid = fork();
-+	if (pid < 0)
-+		perror_msg_and_fail("fork");
-+	if (!pid) {
-+		for (int i = 0; i < num_threads; i++) {
-+			pthread_t t;
-+			if ((errno = pthread_create(&t, NULL, thread, NULL)))
-+				perror_msg_and_fail("pthread_create #%d", i);
-+		}
-+
-+		/* This terminates all threads.  */
-+		_exit(0);
-+	}
-+
-+	int s;
-+	if (waitpid(pid, &s, 0) != pid)
-+		perror_msg_and_fail("waitpid");
-+
-+	assert(WIFEXITED(s));
-+	return WEXITSTATUS(s);
-+}
-Index: strace-4.24/tests/looping_threads.test
-new file mode 0755
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.24/tests/looping_threads.test	2018-09-12 23:53:31.740527461 +0200
-@@ -0,0 +1,37 @@
-+#!/bin/sh
-+#
-+# Check tracing of looping threads.
-+#
-+# Copyright (c) 2009-2018 The strace developers.
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+. "${srcdir=.}/init.sh"
-+
-+check_prog nproc
-+timeout="$(($TIMEOUT_DURATION/10))"
-+nproc="$((64+$timeout+$(nproc)))"
-+
-+run_prog "../$NAME" "$timeout" "$nproc"
-+run_strace -f -qq -enone -esignal=none $args
-Index: strace-4.24/tests/Makefile.in
-===================================================================
--- strace-4.24.orig/tests/Makefile.in	2018-08-14 02:44:39.000000000 +0200
-+++ strace-4.24/tests/Makefile.in	2018-09-13 00:51:18.191618128 +0200
-@@ -155,7 +155,7 @@
- 	ioctl_perf-success$(EXEEXT) ioctl_rtc-v$(EXEEXT) \
- 	is_linux_mips_n64$(EXEEXT) ksysent$(EXEEXT) \
- 	list_sigaction_signum$(EXEEXT) localtime$(EXEEXT) \
-	mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
-+	looping_threads$(EXEEXT) mmsg-silent$(EXEEXT) mmsg_name-v$(EXEEXT) \
- 	msg_control-v$(EXEEXT) net-accept-connect$(EXEEXT) \
- 	net-tpacket_stats-success$(EXEEXT) netlink_inet_diag$(EXEEXT) \
- 	netlink_netlink_diag$(EXEEXT) netlink_unix_diag$(EXEEXT) \
-@@ -1221,6 +1221,9 @@
- lookup_dcookie_OBJECTS = lookup_dcookie.$(OBJEXT)
- lookup_dcookie_LDADD = $(LDADD)
- lookup_dcookie_DEPENDENCIES = libtests.a
-+looping_threads_SOURCES = looping_threads.c
-+looping_threads_OBJECTS = looping_threads.$(OBJEXT)
-+looping_threads_DEPENDENCIES = $(LDADD)
- lseek_SOURCES = lseek.c
- lseek_OBJECTS = lseek.$(OBJEXT)
- lseek_LDADD = $(LDADD)
-@@ -2743,7 +2746,7 @@
- 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
- 	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
- 	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
-+	localtime.c lookup_dcookie.c looping_threads.c lseek.c lstat.c lstat64.c \
- 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
- 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
- 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
-@@ -2888,7 +2891,7 @@
- 	kexec_file_load.c kexec_load.c keyctl.c keyctl-Xabbrev.c \
- 	keyctl-Xraw.c keyctl-Xverbose.c kill.c ksysent.c lchown.c \
- 	lchown32.c link.c linkat.c list_sigaction_signum.c llseek.c \
-	localtime.c lookup_dcookie.c lseek.c lstat.c lstat64.c \
-+	localtime.c lookup_dcookie.c looping_threads.c lseek.c lstat.c lstat64.c \
- 	madvise.c mbind.c membarrier.c memfd_create.c migrate_pages.c \
- 	mincore.c mkdir.c mkdirat.c mknod.c mknodat.c mlock.c mlock2.c \
- 	mlockall.c mmap.c mmap-Xabbrev.c mmap-Xraw.c mmap-Xverbose.c \
-@@ -3911,6 +3914,7 @@
- fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- localtime_LDADD = $(clock_LIBS) $(LDADD)
-+looping_threads_LDADD = -lpthread $(LDADD)
- lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- mmap64_Xabbrev_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
-@@ -4229,6 +4233,7 @@
- 	interactive_block.test \
- 	ksysent.test \
- 	localtime.test \
-+	looping_threads.test \
- 	opipe.test \
- 	options-syntax.test \
- 	pc.test \
-@@ -5226,6 +5231,10 @@
- 	@rm -f lookup_dcookie$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(lookup_dcookie_OBJECTS) $(lookup_dcookie_LDADD) $(LIBS)
- 
-+looping_threads$(EXEEXT): $(looping_threads_OBJECTS) $(looping_threads_DEPENDENCIES) $(EXTRA_looping_threads_DEPENDENCIES) 
-+	@rm -f looping_threads$(EXEEXT)
-+	$(AM_V_CCLD)$(LINK) $(looping_threads_OBJECTS) $(looping_threads_LDADD) $(LIBS)
-+
- lseek$(EXEEXT): $(lseek_OBJECTS) $(lseek_DEPENDENCIES) $(EXTRA_lseek_DEPENDENCIES) 
- 	@rm -f lseek$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(lseek_OBJECTS) $(lseek_LDADD) $(LIBS)
-@@ -6890,6 +6899,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llseek.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup_dcookie.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/looping_threads.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat64-lstat64.Po@am__quote@
--- a/SOURCES/strace-rhbz1610774-0002-Add-a-generic-list-implementation.patch
+++ b/SOURCES/strace-rhbz1610774-0002-Add-a-generic-list-implementation.patch
@ -1,213 +0,0 @@
-From a5855e84f17181167754caa26280161cd786a386 Mon Sep 17 00:00:00 2001
-From: Eugene Syromyatnikov <evgsyr@gmail.com>
-Date: Sun, 11 Sep 2016 12:11:45 +0300
-Subject: [PATCH 2/3] Add a generic list implementation
-
-Similar to one used in the Linux kernel.
-
-* macros.h (cast_ptr, containerof): New macros.
-* list.h: New file.
-* Makefile.am (strace_SOURCES): Add it.
---
- Makefile.am |   1 +
- list.h      | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- macros.h    |   9 ++++
- 3 files changed, 147 insertions(+)
- create mode 100644 list.h
-
-Index: strace-4.24/Makefile.am
-===================================================================
--- strace-4.24.orig/Makefile.am	2018-09-13 00:07:30.798555060 +0200
-+++ strace-4.24/Makefile.am	2018-09-13 00:42:10.058675213 +0200
-@@ -185,6 +185,7 @@
- 	linux/asm_stat.h \
- 	linux/x32/asm_stat.h \
- 	linux/x86_64/asm_stat.h \
-+	list.h		\
- 	listen.c	\
- 	lookup_dcookie.c \
- 	loop.c		\
-Index: strace-4.24/list.h
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ strace-4.24/list.h	2018-09-13 00:42:10.059675201 +0200
-@@ -0,0 +1,137 @@
-+/*
-+ * Some simple implementation of a list similar to one used in the kernel.
-+ *
-+ * Copyright (c) 2016-2018 The strace developers.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef STRACE_LIST_H
-+#define STRACE_LIST_H
-+
-+#include "macros.h"
-+
-+struct list_item {
-+	struct list_item *prev;
-+	struct list_item *next;
-+};
-+
-+#define EMPTY_LIST(l_) struct list_item l_ = { &l_, &l_ }
-+
-+static inline void
-+list_init(struct list_item *l)
-+{
-+	l->prev = l;
-+	l->next = l;
-+}
-+
-+static inline bool
-+list_is_empty(struct list_item *l)
-+{
-+	return (l->next == l) && (l->prev == l);
-+}
-+
-+#define list_elem(var, type, field) containerof((var), type, field)
-+
-+#define list_head(head, type, field) \
-+	(list_is_empty(head) ? NULL : list_elem((head)->next, type, field))
-+#define list_tail(head, type, field) \
-+	(list_is_empty(head) ? NULL : list_elem((head)->prev, type, field))
-+
-+#define list_next(val, field) \
-+	list_elem((val)->field.next, typeof(*(val)), field)
-+#define list_prev(val, field) \
-+	list_elem((val)->field.prev, typeof(*(val)), field)
-+
-+static inline void
-+list_insert(struct list_item *head, struct list_item *item)
-+{
-+	item->next = head->next;
-+	item->prev = head;
-+	head->next->prev = item;
-+	head->next = item;
-+}
-+
-+static inline void
-+list_append(struct list_item *head, struct list_item *item)
-+{
-+	item->next = head;
-+	item->prev = head->prev;
-+	head->prev->next = item;
-+	head->prev = item;
-+}
-+
-+static inline void
-+list_remove(struct list_item *item)
-+{
-+	if (!item->next || !item->prev)
-+		return;
-+
-+	item->prev->next = item->next;
-+	item->next->prev = item->prev;
-+	item->next = item->prev = NULL;
-+}
-+
-+static inline struct list_item *
-+list_remove_tail(struct list_item *head)
-+{
-+	struct list_item *t = list_is_empty(head) ? NULL : head->prev;
-+
-+	if (t)
-+		list_remove(t);
-+
-+	return t;
-+}
-+
-+static inline struct list_item *
-+list_remove_head(struct list_item *head)
-+{
-+	struct list_item *h = list_is_empty(head) ? NULL : head->next;
-+
-+	if (h)
-+		list_remove(h);
-+
-+	return h;
-+}
-+
-+static inline void
-+list_replace(struct list_item *old, struct list_item *new)
-+{
-+	new->next = old->next;
-+	new->prev = old->prev;
-+	old->prev->next = new;
-+	old->next->prev = new;
-+	old->next = old->prev = NULL;
-+}
-+
-+#define list_foreach(var_, head_, field_) \
-+	for (var_ = list_elem((head_)->next, typeof(*var_), field_); \
-+	    &(var_->field_) != (head_); var_ = list_next(var_, field_))
-+
-+#define list_foreach_safe(var_, head_, field_, _tmp) \
-+	for (var_ = list_elem((head_)->next, typeof(*var_), field_), \
-+	    _tmp = list_elem((var_)->field_.next, typeof(*var_), field_); \
-+	    &var_->field_ != head_; var_ = _tmp, _tmp = list_next(_tmp, field_))
-+
-+#endif /* !STRACE_LIST_H */
-Index: strace-4.24/macros.h
-===================================================================
--- strace-4.24.orig/macros.h	2018-09-13 00:07:30.798555060 +0200
-+++ strace-4.24/macros.h	2018-09-13 00:42:10.059675201 +0200
-@@ -53,6 +53,15 @@
- 	(offsetof(type_, member_) + sizeof(((type_ *)0)->member_))
- #endif
- 
-+#ifndef cast_ptr
-+# define cast_ptr(type, var) ((type) (uintptr_t) (const volatile void *) (var))
-+#endif
-+
-+#ifndef containerof
-+# define containerof(x, s, m)	\
-+	cast_ptr(s *, (const volatile char *) (x) - offsetof(s, m))
-+#endif
-+
- static inline bool
- is_filled(const char *ptr, char fill, size_t size)
- {
-Index: strace-4.24/Makefile.in
-===================================================================
--- strace-4.24.orig/Makefile.in	2018-08-14 02:44:37.000000000 +0200
-+++ strace-4.24/Makefile.in	2018-09-13 00:45:21.266213460 +0200
-@@ -340,7 +340,7 @@
- 	ipc_sem.c ipc_shm.c ipc_shmctl.c kcmp.c kernel_types.h kexec.c \
- 	keyctl.c keyctl_kdf_params.h kvm.c largefile_wrappers.h ldt.c \
- 	link.c linux/asm_stat.h linux/x32/asm_stat.h \
-	linux/x86_64/asm_stat.h listen.c lookup_dcookie.c loop.c \
-+	linux/x86_64/asm_stat.h list.h listen.c lookup_dcookie.c loop.c \
- 	lseek.c macros.h mem.c membarrier.c memfd_create.c mknod.c \
- 	mmap_notify.c mmap_notify.h mmsghdr.c mount.c mpers_type.h \
- 	mq.c msghdr.c msghdr.h mtd.c native_defs.h negated_errno.h \
-@@ -1357,7 +1357,7 @@
- 	ipc_shmctl.c kcmp.c kernel_types.h kexec.c keyctl.c \
- 	keyctl_kdf_params.h kvm.c largefile_wrappers.h ldt.c link.c \
- 	linux/asm_stat.h linux/x32/asm_stat.h linux/x86_64/asm_stat.h \
-	listen.c lookup_dcookie.c loop.c lseek.c macros.h mem.c \
-+	list.h listen.c lookup_dcookie.c loop.c lseek.c macros.h mem.c \
- 	membarrier.c memfd_create.c mknod.c mmap_notify.c \
- 	mmap_notify.h mmsghdr.c mount.c mpers_type.h mq.c msghdr.c \
- 	msghdr.h mtd.c native_defs.h negated_errno.h net.c netlink.c \
--- a/SPECS/strace.spec
+++ b/SPECS/strace.spec
@ -1,17 +1,79 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
 Version: 4.24
-Release: 3%{?dist}
-License: BSD
+Release: 5%{?dist}
+License: LGPL-2.1+ and GPL-2.0+
 Group: Development/Debuggers
 URL: https://strace.io
 Source: https://strace.io/files/%{version}/strace-%{version}.tar.xz
-BuildRequires: gcc gzip
+BuildRequires: libacl-devel time gcc gzip
+BuildRequires: pkgconfig(bluez)
+BuildRequires: elfutils-devel binutils-devel

-Patch1: strace-rhbz1610774-0000-strace.c-introduce-struct-tcb_wait_data.patch
-Patch2: strace-rhbz1610774-0001-tests-check-tracing-of-looping-threads.patch
-Patch3: strace-rhbz1610774-0002-Add-a-generic-list-implementation.patch
-Patch4: strace-rhbz1610774-0003-Implement-queueing-of-threads-before-dispatching-the.patch
+# General bug fixes
+Patch1:  0001-evdev-fix-decoding-of-bit-sets.patch
+Patch2:  0002-evdev-fix-decoding-of-EVIOCGBIT-0.patch
+Patch3:  0003-xlat-fix-typo-in-smc_protocols.in.patch
+
+# Pre-requisite for the queueing patch
+Patch4:  0004-strace.c-introduce-struct-tcb_wait_data.patch
+
+# Documentation
+Patch5:  0005-Document-X-option-in-strace-h-output.patch
+
+# Addresses https://bugzilla.redhat.com/1660759 ("strace prints "xlat_idx:
+# Unexpected xlat value 0 at index 4" messages")
+Patch6:  0006-evdev-fix-off-by-one-error-in-decode_bitset.patch
+Patch7:  0007-nlattr-fix-off-by-one-error-in-indexed-xlat-lookup.patch
+Patch8:  0008-aio-fix-off-by-one-error-in-indexed-xlat-lookup.patch
+Patch9:  0009-rtnl_link-fix-off-by-one-errors-in-indexed-and-sorte.patch
+Patch10: 0010-xlat_idx-do-not-issue-warnings-for-holes-in-indices.patch
+
+# man page updates
+Patch11: 0011-strace.1.in-print-names-of-entities-in-bold-provide-.patch
+Patch12: 0012-strace.1.in-consistently-use-CTRL-combinations.patch
+
+# License change
+Patch13: 0013-tests-change-the-license-to-GPL-2.0-or-later.patch
+Patch14: 0014-Change-the-license-of-strace-to-LGPL-2.1-or-later.patch
+
+# Tests fixes
+Patch15: 0015-tests-use-tail_alloc-instead-of-calloc-in-bpf-obj_ge.patch
+Patch16: 0016-tests-fix-prog_info-initialization-in-bpf-obj_get_in.patch
+
+# General bug fixes
+Patch17: 0017-Merge-.-resumed-printing.patch
+Patch18: 0018-Use-accessors-for-tcp-s_ent-return-a-stub-struct-if-.patch
+Patch19: 0019-syscall.c-set-MEMORY_MAPPING_CHANGE-in-stub-sysent.patch
+
+# Addresses https://bugzilla.redhat.com/1662936 ("strace reports
+# 'ptrace(SYSCALL): No such process' on multi-threaded testcase on RHEL-8")
+Patch20: 0020-Make-inline-message-on-failed-restart-attempt-more-v.patch
+Patch21: 0021-ptrace_restart-do-not-print-diagnostics-when-ptrace-.patch
+
+# Pre-requisites for the queueing patch
+Patch22: 0022-tests-add-kill_child-test.patch
+Patch23: 0023-tests-move-PTRACE_SEIZE-check-to-a-separate-file.patch
+Patch24: 0024-tests-check-tracing-of-orphaned-process-group.patch
+Patch25: 0025-tests-check-tracing-of-looping-threads.patch
+
+# Implementation of tcp queueing
+# Addresses https://bugzilla.redhat.com/1609318 ("Some threads are not created
+# when strace with -f option is executed") and all previous its incarnations
+# (478419, 526740, 851457, 1610774).
+Patch26: 0026-Add-a-generic-list-implementation.patch
+Patch27: 0027-Implement-queueing-of-threads-before-dispatching-the.patch
+
+# Wire up rseq and kexec_file_load in order to avoid kexec_file_load
+# test failure on aarch64. Addresses https://bugzilla.redhat.com/1676045
+# ("strace: FTBFS in Fedora rawhide/f30").
+Patch28: 0028-Wire-up-rseq-syscall-on-architectures-that-use-gener.patch
+Patch29: 0029-Wire-up-kexec_file_load-syscall-on-architectures-tha.patch
+
+# Limit scope of qual_fault.test in order to avoid test timeout on aarch64
+Patch30: 0030-limit-qual_fault-test-on-aarch64.patch
+
+Patch31: 0031-avoid-zero-length-VLA-in-evdev_c.patch

 # We no longer need to build a separate strace32 binary, but we don't want
 # to break existing strace32 users' workflows.
@ -21,28 +83,9 @@ Patch4: strace-rhbz1610774-0003-Implement-queueing-of-threads-before-dispatching
 %define _isa_compat %{?__isa_name:(%{__isa_name}-32)}%{!?__isa:%{nil}}
 %define evr %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  strace32 = %{evr}
-Obsoletes: strace32 < %{evr} strace32%{_isa_compat} < %{evr}
+Obsoletes: strace32 < %{version} strace32%{_isa_compat} < %{version}
 %endif

-# Install Bluetooth headers for AF_BLUETOOTH sockets decoding.
-%if 0%{?fedora} >= 18 || 0%{?centos} >= 8 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1200
-BuildRequires: pkgconfig(bluez)
-%endif
-
-# Install elfutils-devel or libdw-devel to enable strace -k option.
-# Install binutils-devel to enable symbol demangling.
-%if 0%{?fedora} >= 20 || 0%{?centos} >= 6 || 0%{?rhel} >= 6
-%define buildrequires_stacktrace BuildRequires: elfutils-devel binutils-devel
-%endif
-%if 0%{?suse_version} >= 1100
-%define buildrequires_stacktrace BuildRequires: libdw-devel binutils-devel
-%endif
-%{?buildrequires_stacktrace}
-
-# OBS compatibility
-%{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}
-%define maybe_use_defattr %{?suse_version:%%defattr(-,root,root)}
-
 %description
 The strace program intercepts and records the system calls called and
 received by a running process.  Strace can print a record of each
@ -60,12 +103,39 @@ received by a process.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1

 chmod a+x tests/*.test

 echo -n %version-%release > .tarball-version
-echo -n 2018 > .year
-echo -n 2018-08-14 > .strace.1.in.date
+echo -n 2019 > .year
+echo -n 2019-06-12 > .strace.1.in.date

 %build
 echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'
@ -80,9 +150,12 @@ printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($k
 echo 'END OF BUILD ENVIRONMENT INFORMATION'

 CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
-%configure --enable-mpers=check
+# Commit v4.26-50-gb1a2db9 is needed for enforcing libiberty usage with
+# --with-libiberty
+%configure --enable-mpers=check --with-libdw
 make %{?_smp_mflags}

+
 %install
 make DESTDIR=%{buildroot} install

@ -100,8 +173,17 @@ done
 wait

 %check
+# This is needed since patch does not set x bit to the newly created files
+# (0022-tests-add-kill_child-test.patch,
+#  0024-tests-check-tracing-of-orphaned-process-group.patch,
+#  0025-tests-check-tracing-of-looping-threads.patch)
+chmod u+x tests/*.test tests-m32/*.test tests-mx32/*.test
+
 %{buildroot}%{_bindir}/strace -V
-make %{?_smp_mflags} -k check VERBOSE=1 TIMEOUT_DURATION=1800
+
+# We have to limit concurrent execution of tests as some time-sensitive tests
+# start to fail if the reported time is way too off from the expected one.
+make -j2 -k check VERBOSE=1 V=1 TIMEOUT_DURATION=5400
 echo 'BEGIN OF TEST SUITE INFORMATION'
 tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
 find tests* -type f -name '*.log' -print0 |
@ -109,8 +191,8 @@ find tests* -type f -name '*.log' -print0 |
 echo 'END OF TEST SUITE INFORMATION'

 %files
-%maybe_use_defattr
-%doc CREDITS ChangeLog.gz ChangeLog-CVS.gz COPYING NEWS README
+%defattr(-,root,root)
+%doc CREDITS ChangeLog.gz ChangeLog-CVS.gz COPYING LGPL-2.1-or-later NEWS README
 %{_bindir}/strace
 %ifarch %{strace32_arches}
 %{_bindir}/strace32
@ -119,6 +201,15 @@ echo 'END OF TEST SUITE INFORMATION'
 %{_mandir}/man1/*

 %changelog
+* Fri Jun 14 2019 Eugene Syromiatnikov <esyr@redhat.com> - 4.24-5
+- Use SPDX abbreviations for licenses.
+
+* Wed Jun 12 2019 Eugene Syromiatnikov <esyr@redhat.com> - 4.24-4
+- Sync up thread handling unfairness fix with the upstream version.
+- Fix "xlat_idx: Unexpected xlat value 0 at index ..." messages (#1660759).
+- Remove "ptrace(SYSCALL): No such process" messages (#1662936).
+- Wire up rseq and kexec_file_load on aarch64 (#1676045).
+
 * Mon Dec 17 2018 Eugene Syromiatnikov <esyr@redhat.com> - 4.24-3
 - Add current version of the thread handling unfairness fix.