summaryrefslogtreecommitdiff
path: root/pkg/strace/patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/strace/patch')
-rw-r--r--pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch8
-rw-r--r--pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch16
-rw-r--r--pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch8
-rw-r--r--pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch16
-rw-r--r--pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch12
-rw-r--r--pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch14
-rw-r--r--pkg/strace/patch/0011-Avoid-index-ranges.patch6
-rw-r--r--pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch23
8 files changed, 59 insertions, 44 deletions
diff --git a/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
index 809d1195..5a4a9abc 100644
--- a/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
+++ b/pkg/strace/patch/0001-Don-t-return-expression-in-void-function.patch
@@ -1,4 +1,4 @@
-From 31b94597cb3fea4043007cc54103067d5053f15c Mon Sep 17 00:00:00 2001
+From 5c0b5a421c4dd366e75945fbcba2591835d6e7ed Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 5 Jul 2019 20:52:24 -0700
Subject: [PATCH] Don't return expression in void function
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't return expression in void function
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/defs.h b/defs.h
-index 3aa07fb8..22fc852d 100644
+index 7151e90c..656c04a5 100644
--- a/defs.h
+++ b/defs.h
-@@ -679,7 +679,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
+@@ -704,7 +704,7 @@ extern bool pathtrace_match_set(struct tcb *, struct path_set *);
static inline void
pathtrace_select(const char *path)
{
@@ -21,5 +21,5 @@ index 3aa07fb8..22fc852d 100644
static inline bool
--
-2.26.2
+2.28.0
diff --git a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
index 1464065c..563076e6 100644
--- a/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
+++ b/pkg/strace/patch/0002-Use-__typeof__-spelling-of-typeof.patch
@@ -1,4 +1,4 @@
-From f0030f1c023963e1d58f91026ab6f1d714a7af06 Mon Sep 17 00:00:00 2001
+From 4df6fee4836c6ecceb33221ec93f36592973bd12 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 6 Jul 2019 01:33:01 -0700
Subject: [PATCH] Use __typeof__ spelling of typeof
@@ -54,12 +54,12 @@ index 77ce151f..6e6cb721 100644
&info, sizeof(info), tfetch_mem,
print_btrfs_ioctl_space_info, 0);
diff --git a/defs.h b/defs.h
-index 3fd8cba1..08e85fed 100644
+index 656c04a5..732542e4 100644
--- a/defs.h
+++ b/defs.h
-@@ -1699,8 +1699,8 @@ scno_is_valid(kernel_ulong_t scno)
+@@ -1760,8 +1760,8 @@ scno_is_valid(kernel_ulong_t scno)
- #define ILOG2_ITER_(val_, ret_, bit_) \
+ # define ILOG2_ITER_(val_, ret_, bit_) \
do { \
- typeof(ret_) shift_ = \
- ((val_) > ((((typeof(val_)) 1) \
@@ -91,10 +91,10 @@ index d9a07ab0..63c2bcb3 100644
tfetch_mem,
print_fiemap_extent, 0);
diff --git a/gcc_compat.h b/gcc_compat.h
-index 0525b5e1..042c7961 100644
+index 4c23ebc9..8eaa54bf 100644
--- a/gcc_compat.h
+++ b/gcc_compat.h
-@@ -44,7 +44,7 @@
+@@ -59,7 +59,7 @@
# endif
# if GNUC_PREREQ(3, 0)
@@ -159,10 +159,10 @@ index 2a474dc4..2423f65e 100644
printf(", ");
printf("{transid=%" PRI__u64 ", objectid=",
diff --git a/tests/fcntl-common.c b/tests/fcntl-common.c
-index 27694326..46667e4e 100644
+index ec18aa79..637bb405 100644
--- a/tests/fcntl-common.c
+++ b/tests/fcntl-common.c
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
#define TEST_FLOCK64_EINVAL(cmd) test_flock64_einval(cmd, #cmd)
#ifdef HAVE_TYPEOF
diff --git a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch b/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
index 85d12ee0..94958d5e 100644
--- a/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
+++ b/pkg/strace/patch/0003-Make-tcp_sysent-a-static-inline-function.patch
@@ -1,4 +1,4 @@
-From fe31c8756a4aa79c573e2adb700d6e99230dad25 Mon Sep 17 00:00:00 2001
+From 4c3d1d35211e789a14352787f16c2db2fc6293f7 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 6 Jul 2019 01:40:36 -0700
Subject: [PATCH] Make tcp_sysent a static inline function
@@ -10,10 +10,10 @@ operator without evaluating the macro argument multiple times.
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/defs.h b/defs.h
-index 22fc852d..1cd30658 100644
+index 732542e4..e7ff7d0b 100644
--- a/defs.h
+++ b/defs.h
-@@ -366,8 +366,12 @@ struct tcb {
+@@ -374,8 +374,12 @@ struct tcb {
# define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL)
# define has_seccomp_filter(tcp) ((tcp)->flags & TCB_SECCOMP_FILTER)
@@ -29,5 +29,5 @@ index 22fc852d..1cd30658 100644
# include "xlat.h"
--
-2.26.2
+2.28.0
diff --git a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
index 3973eed6..5fcf9422 100644
--- a/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
+++ b/pkg/strace/patch/0004-Avoid-empty-initializer-lists.patch
@@ -1,4 +1,4 @@
-From 6b445913b3178e5056b13e73ab03cc05d2b47bc4 Mon Sep 17 00:00:00 2001
+From d57542b29ffe81ac355c2889aa5cf326b60e7d67 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 6 Jul 2019 01:54:05 -0700
Subject: [PATCH] Avoid empty initializer lists
@@ -20,7 +20,7 @@ Subject: [PATCH] Avoid empty initializer lists
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bpf.c b/bpf.c
-index af830053..6b77f17f 100644
+index 0ec33ba4..16cbf257 100644
--- a/bpf.c
+++ b/bpf.c
@@ -43,7 +43,7 @@ bpf_cmd_decoder(struct tcb *const tcp, \
@@ -42,7 +42,7 @@ index af830053..6b77f17f 100644
print_array(tcp, addr, len, &insn, sizeof(insn),
diff --git a/net.c b/net.c
-index fa4638e7..7b049211 100644
+index 2099f0ac..316cecf2 100644
--- a/net.c
+++ b/net.c
@@ -655,7 +655,7 @@ print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
@@ -55,10 +55,10 @@ index fa4638e7..7b049211 100644
if (len > (int) sizeof(filter))
len = sizeof(filter);
diff --git a/sched.c b/sched.c
-index 788ef39b..2e5775d5 100644
+index ff427e48..2f46a836 100644
--- a/sched.c
+++ b/sched.c
-@@ -94,7 +94,7 @@ static void
+@@ -99,7 +99,7 @@ static void
print_sched_attr(struct tcb *const tcp, const kernel_ulong_t addr,
unsigned int usize)
{
@@ -68,7 +68,7 @@ index 788ef39b..2e5775d5 100644
bool is_set = false;
diff --git a/signal.c b/signal.c
-index d5d59105..d20317ca 100644
+index 49b4ebd5..a809d260 100644
--- a/signal.c
+++ b/signal.c
@@ -246,7 +246,7 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
@@ -81,10 +81,10 @@ index d5d59105..d20317ca 100644
return;
tprints(sprintsigmask_n("", mask, len));
diff --git a/strace.c b/strace.c
-index 4c96a98b..fed04fc9 100644
+index 2897195c..280f1a68 100644
--- a/strace.c
+++ b/strace.c
-@@ -3359,7 +3359,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
+@@ -3381,7 +3381,7 @@ trace_syscall(struct tcb *tcp, unsigned int *sig)
syscall_entering_finish(tcp, res);
return res;
} else {
diff --git a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch b/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
index 4e048d96..73bdff61 100644
--- a/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
+++ b/pkg/strace/patch/0007-Don-t-omit-second-operand-to-operator.patch
@@ -1,4 +1,4 @@
-From dc7f55485c8562999b5bc2ae713a3aec0c90bce8 Mon Sep 17 00:00:00 2001
+From 1d0a51b8e89231e92b0b3280dd850eccfa6cf143 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 7 Jul 2019 21:53:16 -0700
Subject: [PATCH] Don't omit second operand to '?' operator
@@ -10,7 +10,7 @@ Subject: [PATCH] Don't omit second operand to '?' operator
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/open.c b/open.c
-index 690453ed..1960ea1c 100644
+index eb6af088..16e64946 100644
--- a/open.c
+++ b/open.c
@@ -77,8 +77,9 @@ sprint_open_modes64(uint64_t flags)
@@ -39,10 +39,10 @@ index b904fa34..1366a89e 100644
return out;
}
diff --git a/strace.c b/strace.c
-index 2a4e6001..352c8282 100644
+index 280f1a68..11a3d9dd 100644
--- a/strace.c
+++ b/strace.c
-@@ -2235,7 +2235,7 @@ init(int argc, char *argv[])
+@@ -2251,7 +2251,7 @@ init(int argc, char *argv[])
break;
case GETOPT_TS:
tflag_long_set = true;
@@ -51,7 +51,7 @@ index 2a4e6001..352c8282 100644
error_opt_arg(c, lopt, optarg);
break;
case 'T':
-@@ -2332,10 +2332,10 @@ init(int argc, char *argv[])
+@@ -2351,10 +2351,10 @@ init(int argc, char *argv[])
qualify_kvm(optarg);
break;
case GETOPT_QUAL_QUIET:
@@ -65,5 +65,5 @@ index 2a4e6001..352c8282 100644
default:
error_msg_and_help(NULL);
--
-2.26.2
+2.28.0
diff --git a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
index dd73025d..dae96992 100644
--- a/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
+++ b/pkg/strace/patch/0008-Avoid-unnecessary-VLAs.patch
@@ -1,4 +1,4 @@
-From 87f14954600cd3bb13c82b1bb992a89bff545f9c Mon Sep 17 00:00:00 2001
+From 0308e8cd17c92f96a61d8b231336caa299d7683d Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 7 Jul 2019 21:58:46 -0700
Subject: [PATCH] Avoid unnecessary VLAs
@@ -92,7 +92,7 @@ index be459714..819abc92 100644
if (!inet_ntop(diag_msg->idiag_family, diag_msg->id.idiag_dst,
dst_buf, text_size))
diff --git a/syscall.c b/syscall.c
-index 022cab5b..37097d92 100644
+index d228ae4d..c8fdd85e 100644
--- a/syscall.c
+++ b/syscall.c
@@ -295,7 +295,7 @@ decode_socket_subcall(struct tcb *tcp)
@@ -105,10 +105,10 @@ index 022cab5b..37097d92 100644
if (umoven(tcp, tcp->u_arg[1], nargs * current_wordsize, buf) < 0)
return;
diff --git a/util.c b/util.c
-index 6eda524d..c15e6514 100644
+index 481144bf..b65479a0 100644
--- a/util.c
+++ b/util.c
-@@ -481,8 +481,7 @@ enum sock_proto
+@@ -493,8 +493,7 @@ enum sock_proto
getfdproto(struct tcb *tcp, int fd)
{
#ifdef HAVE_SYS_XATTR_H
@@ -118,15 +118,15 @@ index 6eda524d..c15e6514 100644
ssize_t r;
char path[sizeof("/proc/%u/fd/%u") + 2 * sizeof(int)*3];
-@@ -490,7 +489,7 @@ getfdproto(struct tcb *tcp, int fd)
+@@ -502,7 +501,7 @@ getfdproto(struct tcb *tcp, int fd)
return SOCK_PROTO_UNKNOWN;
- xsprintf(path, "/proc/%u/fd/%u", tcp->pid, fd);
+ xsprintf(path, "/proc/%u/fd/%u", get_proc_pid(tcp), fd);
- r = getxattr(path, "system.sockprotoname", buf, bufsize - 1);
+ r = getxattr(path, "system.sockprotoname", buf, sizeof(buf) - 1);
if (r <= 0)
return SOCK_PROTO_UNKNOWN;
else {
--
-2.26.2
+2.28.0
diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch
index 63b38104..efd1dc88 100644
--- a/pkg/strace/patch/0011-Avoid-index-ranges.patch
+++ b/pkg/strace/patch/0011-Avoid-index-ranges.patch
@@ -1,4 +1,4 @@
-From 82bc9666c33984b6655fce1c142a8e8773dbb398 Mon Sep 17 00:00:00 2001
+From ca8d72a8002c4c6946947603819436687573e2fa Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 30 Jan 2020 22:32:50 -0800
Subject: [PATCH] Avoid index ranges
@@ -33,10 +33,10 @@ index c5d5f5c4..a7c54b3e 100644
return sprint_mac_addr(hwaddr, MIN(size, sz));
diff --git a/util.c b/util.c
-index 0e1ea8df..c831e2ec 100644
+index b65479a0..40b5a186 100644
--- a/util.c
+++ b/util.c
-@@ -1185,16 +1185,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
+@@ -1198,16 +1198,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr,
? 1 + ilog2_klong(len - 1) / HEX_BIT : DUMPSTR_OFFS_MIN_CHARS;
kernel_ulong_t i = 0;
const unsigned char *src;
diff --git a/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
index 394258a9..c9b7b2f9 100644
--- a/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
+++ b/pkg/strace/patch/1001-Prevent-zero-sized-arrays.patch
@@ -1,5 +1,17 @@
+From 8f8487a1c0e9be10746b255383fc892095174aac Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 26 Sep 2020 16:30:33 -0700
+Subject: [PATCH] Prevent zero-sized arrays
+
+---
+ xlat/btrfs_features_compat.h | 3 ++-
+ xlat/mq_attr_flags.h | 3 ++-
+ xlat/sigprof_codes.h | 3 ++-
+ xlat/sock_ipx_options.h | 3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
diff --git a/xlat/btrfs_features_compat.h b/xlat/btrfs_features_compat.h
-index d74af3154..70331b1d7 100644
+index d74af31..70331b1 100644
--- a/xlat/btrfs_features_compat.h
+++ b/xlat/btrfs_features_compat.h
@@ -13,13 +13,14 @@ extern const struct xlat btrfs_features_compat[];
@@ -19,7 +31,7 @@ index d74af3154..70331b1d7 100644
.flags_mask = 0
,
diff --git a/xlat/mq_attr_flags.h b/xlat/mq_attr_flags.h
-index 9dfbe94d8..84ec9cd3c 100644
+index 9dfbe94..84ec9cd 100644
--- a/xlat/mq_attr_flags.h
+++ b/xlat/mq_attr_flags.h
@@ -18,13 +18,14 @@ static const struct xlat_data mq_attr_flags_xdata[] = {
@@ -39,7 +51,7 @@ index 9dfbe94d8..84ec9cd3c 100644
.flags_mask = 0
# ifdef XLAT_VAL_0
diff --git a/xlat/sigprof_codes.h b/xlat/sigprof_codes.h
-index 65614dc28..a173d59b7 100644
+index 65614dc..a173d59 100644
--- a/xlat/sigprof_codes.h
+++ b/xlat/sigprof_codes.h
@@ -18,13 +18,14 @@ static const struct xlat_data sigprof_codes_xdata[] = {
@@ -59,7 +71,7 @@ index 65614dc28..a173d59b7 100644
.flags_mask = 0
# ifdef XLAT_VAL_0
diff --git a/xlat/sock_ipx_options.h b/xlat/sock_ipx_options.h
-index 166d010dc..527089bc0 100644
+index 166d010..527089b 100644
--- a/xlat/sock_ipx_options.h
+++ b/xlat/sock_ipx_options.h
@@ -18,11 +18,12 @@ static const struct xlat_data sock_ipx_options_xdata[] = {
@@ -76,3 +88,6 @@ index 166d010dc..527089bc0 100644
.type = XT_NORMAL,
.flags_mask = 0
# ifdef XLAT_VAL_0
+--
+2.28.0
+
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-12 11:53:29 +0000