diff options
Diffstat (limited to 'patches')
16 files changed, 483 insertions, 42 deletions
diff --git a/patches/ltrace/0.7.3/001-avoid-libstdc++.patch b/patches/ltrace/0.7.3/001-avoid-libstdc++.patch new file mode 100644 index 0000000..9cbf557 --- /dev/null +++ b/patches/ltrace/0.7.3/001-avoid-libstdc++.patch @@ -0,0 +1,43 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: avoid warning from dpkg-shlibdeps: + package could avoid a useless dependency if ltrace was not + linked against libstdc++.so.6 (it uses none of the library's symbols) +Last-Update: 2013-12-30 + + +--- a/configure.ac 2013-09-17 01:04:28.000000000 +0200 ++++ b/configure.ac 2013-12-30 12:24:20.000000000 +0100 +@@ -113,6 +113,15 @@ + libstdcxx_LIBS=""]) + AC_SUBST(libstdcxx_LIBS) + ++if test "x$liberty_LIBS" != "x" ++then ++ libsupcxx_LIBS="" ++ libstdcxx_LIBS="" ++elif test "x$libsupcxx_LIBS" != "x" ++then ++ libstdcxx_LIBS="" ++fi ++ + + dnl Check security_get_boolean_active availability. + AC_CHECK_HEADERS(selinux/selinux.h) +--- a/configure 2013-09-17 01:07:46.000000000 +0100 ++++ b/configure 2013-12-30 12:34:23.000000000 +0100 +@@ -11826,6 +11826,15 @@ + + + ++if test "x$liberty_LIBS" != "x" ++then ++ libsupcxx_LIBS="" ++ libstdcxx_LIBS="" ++elif test "x$libsupcxx_LIBS" != "x" ++then ++ libstdcxx_LIBS="" ++fi ++ + + for ac_header in selinux/selinux.h + do : diff --git a/patches/ltrace/0.7.3/002-printf-p.patch b/patches/ltrace/0.7.3/002-printf-p.patch new file mode 100644 index 0000000..10631d9 --- /dev/null +++ b/patches/ltrace/0.7.3/002-printf-p.patch @@ -0,0 +1,18 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: Prevent freeing static-alloc'd memory for %p and %n in printf +Bug-Debian: http://bugs.debian.org/614994 +Forwarded: http://lists.alioth.debian.org/pipermail/ltrace-devel/2013-September/000953.html +Last-Update: 2014-01-02 + + +--- ltrace-0.7.3.orig/printf.c ++++ ltrace-0.7.3/printf.c +@@ -168,7 +168,7 @@ form_next_param(struct param_enum *self, + type_init_pointer(infop, array, 1); + + } else if (format_type == ARGTYPE_POINTER) { +- type_init_pointer(infop, elt_info, 1); ++ type_init_pointer(infop, elt_info, 0); + + } else { + *infop = *type_get_simple(format_type); diff --git a/patches/ltrace/0.7.3/003-alpha-debug.h.patch b/patches/ltrace/0.7.3/003-alpha-debug.h.patch new file mode 100644 index 0000000..237026d --- /dev/null +++ b/patches/ltrace/0.7.3/003-alpha-debug.h.patch @@ -0,0 +1,17 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: fixed FTBFS on alpha + don't include "debug.h" twice +Last-Update: 2014-01-02 +Bug-Debian: http://bugs.debian.org/678721 + + +--- ltrace-0.7.3.orig/sysdeps/linux-gnu/alpha/trace.c ++++ ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c +@@ -29,7 +29,6 @@ + + #include "proc.h" + #include "common.h" +-#include "debug.h" + + #if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR)) + # define PTRACE_PEEKUSER PTRACE_PEEKUSR diff --git a/patches/ltrace/0.7.3/004-compile-warning.patch b/patches/ltrace/0.7.3/004-compile-warning.patch new file mode 100644 index 0000000..ad65829 --- /dev/null +++ b/patches/ltrace/0.7.3/004-compile-warning.patch @@ -0,0 +1,28 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: Fix compile warning +Last-Update: 2014-01-02 +Forwarded: not-needed + + +--- ltrace-0.7.3.orig/value.c ++++ ltrace-0.7.3/value.c +@@ -284,7 +284,7 @@ value_init_deref(struct value *ret_val, + + /* We need "long" to be long enough to hold platform + * pointers. */ +- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; ++ (void)sizeof(char[1 - 2*(sizeof(l) < sizeof(void *))]); + + value_common_init(ret_val, valp->inferior, valp, + valp->type->u.ptr_info.info, 0); +--- ltrace-0.7.3.orig/lens_default.c ++++ ltrace-0.7.3/lens_default.c +@@ -344,7 +344,7 @@ format_array(FILE *stream, struct value + { + /* We need "long" to be long enough to cover the whole address + * space. */ +- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; ++ (void)sizeof(char[1 - 2*(sizeof(long) < sizeof(void *))]); + long l; + if (expr_eval_word(length, value, arguments, &l) < 0) + return -1; diff --git a/patches/ltrace/0.7.3/005-sparc-ftbfs.patch b/patches/ltrace/0.7.3/005-sparc-ftbfs.patch new file mode 100644 index 0000000..266a8e6 --- /dev/null +++ b/patches/ltrace/0.7.3/005-sparc-ftbfs.patch @@ -0,0 +1,31 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: fixes compilation on sparc +Last-Update: 2014-01-02 + + +--- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/plt.c ++++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/plt.c +@@ -19,8 +19,9 @@ + */ + + #include <gelf.h> ++ + #include "proc.h" +-#include "common.h" ++#include "library.h" + + GElf_Addr + arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) { +--- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/trace.c ++++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/trace.c +@@ -26,8 +26,10 @@ + #include <sys/wait.h> + #include <signal.h> + #include <string.h> ++ + #include "ptrace.h" + #include "proc.h" ++#include "backend.h" + #include "common.h" + + void diff --git a/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch b/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch new file mode 100644 index 0000000..443bee4 --- /dev/null +++ b/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch @@ -0,0 +1,22 @@ +From: Juan Cespedes <cespedes@debian.org> +Description: continue after unexpected breakpoint + (instead of decrementing PC and execute int3 again and again) +Last-Update: 2014-01-03 + + +--- ltrace-0.7.3.orig/handle_event.c ++++ ltrace-0.7.3/handle_event.c +@@ -656,9 +656,12 @@ handle_breakpoint(Event *event) + + if ((sbp = address2bpstruct(leader, brk_addr)) != NULL) + breakpoint_on_hit(sbp, event->proc); +- else if (event->proc->state != STATE_IGNORED) ++ else if (event->proc->state != STATE_IGNORED) { + output_line(event->proc, + "unexpected breakpoint at %p", brk_addr); ++ continue_process(event->proc->pid); ++ return; ++ } + + /* breakpoint_on_hit may delete its own breakpoint, so we have + * to look it up again. */ diff --git a/patches/ltrace/0.7.3/110-ltrace.git-8c3674c86688a79a8689772c3d0c84d6e7aaa118.patch b/patches/ltrace/0.7.3/007-gcc-5.patch index 4c62f85..4c62f85 100644 --- a/patches/ltrace/0.7.3/110-ltrace.git-8c3674c86688a79a8689772c3d0c84d6e7aaa118.patch +++ b/patches/ltrace/0.7.3/007-gcc-5.patch diff --git a/patches/ltrace/0.7.3/100-ltrace.git-a77b267abb870c935f9b4187ca31409fa5eb9dcb.patch b/patches/ltrace/0.7.3/100-ltrace.git-a77b267abb870c935f9b4187ca31409fa5eb9dcb.patch deleted file mode 100644 index 64691ce..0000000 --- a/patches/ltrace/0.7.3/100-ltrace.git-a77b267abb870c935f9b4187ca31409fa5eb9dcb.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a77b267abb870c935f9b4187ca31409fa5eb9dcb Mon Sep 17 00:00:00 2001 -From: Peter Wu <lekensteyn@gmail.com> -Date: Thu, 26 Sep 2013 00:55:55 +0200 -Subject: [PATCH] Fix compile warning about unused typedef - -Switch assertion to style as used by the Linux kernel (BUILD_BUG_ON) - -Signed-off-by: Peter Wu <lekensteyn@gmail.com> ---- - lens_default.c | 2 +- - value.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lens_default.c b/lens_default.c -index e0c0566..84b74ea 100644 ---- a/lens_default.c -+++ b/lens_default.c -@@ -345,7 +345,7 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments, - { - /* We need "long" to be long enough to cover the whole address - * space. */ -- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; -+ (void)sizeof(char[1 - 2*(sizeof(long) < sizeof(void *))]); - long l; - if (expr_eval_word(length, value, arguments, &l) < 0) - return -1; -diff --git a/value.c b/value.c -index d18db17..8caf98c 100644 ---- a/value.c -+++ b/value.c -@@ -284,7 +284,7 @@ value_init_deref(struct value *ret_val, struct value *valp) - - /* We need "long" to be long enough to hold platform - * pointers. */ -- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; -+ (void)sizeof(char[1 - 2*(sizeof(l) < sizeof(void *))]); - - value_common_init(ret_val, valp->inferior, valp, - valp->type->u.ptr_info.info, 0); --- -1.8.5.2 - diff --git a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch b/patches/strace/4.10/001_aarch64_rt_sigreturn.patch new file mode 100644 index 0000000..6b7bbe3 --- /dev/null +++ b/patches/strace/4.10/001_aarch64_rt_sigreturn.patch @@ -0,0 +1,21 @@ +commit d76d3069526c348e6fe5d40bbbceb2ae4a928d16 +Author: Dmitry V. Levin <ldv@altlinux.org> +Date: Wed Mar 11 14:32:25 2015 +0000 + + aarch64: fix rt_sigreturn decoding + + * sigreturn.c (sys_sigreturn) [AARCH64]: Fix personality check. + +diff --git a/sigreturn.c b/sigreturn.c +index 648bd0a..c253a0c 100644 +--- a/sigreturn.c ++++ b/sigreturn.c +@@ -23,7 +23,7 @@ sys_sigreturn(struct tcb *tcp) + # define OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK (5 * 4 + SIZEOF_STRUCT_SIGCONTEXT) + const long addr = + # ifdef AARCH64 +- current_personality == 0 ? ++ current_personality == 1 ? + (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + + offsetof(struct ucontext, uc_sigmask)) : + # endif diff --git a/patches/strace/4.10/002_arm_mmap2.patch b/patches/strace/4.10/002_arm_mmap2.patch new file mode 100644 index 0000000..41953e2 --- /dev/null +++ b/patches/strace/4.10/002_arm_mmap2.patch @@ -0,0 +1,22 @@ +commit dbadf7bcc8995612d5ef737047b909e868387e37 +Author: Andreas Schwab <schwab@suse.de> +Date: Mon Mar 9 16:55:06 2015 +0100 + + Fix decoding of mmap2 for arm + + * syscallent.h (mmap2): Decode with sys_mmap_4koff, not + sys_mmap_pgoff. + +diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h +index 52aed9e..b66a5a2 100644 +--- a/linux/arm/syscallent.h ++++ b/linux/arm/syscallent.h +@@ -218,7 +218,7 @@ + [189] = { 5, 0, sys_putpmsg, "putpmsg" }, + [190] = { 0, TP, sys_vfork, "vfork" }, + [191] = { 2, 0, sys_getrlimit, "ugetrlimit" }, +-[192] = { 6, TD|TM|SI, sys_mmap_pgoff, "mmap2" }, ++[192] = { 6, TD|TM|SI, sys_mmap_4koff, "mmap2" }, + [193] = { 4, TF, sys_truncate64, "truncate64" }, + [194] = { 4, TD, sys_ftruncate64, "ftruncate64" }, + [195] = { 2, TF, sys_stat64, "stat64" }, diff --git a/patches/strace/4.10/003_aarch64_arch_regs.patch b/patches/strace/4.10/003_aarch64_arch_regs.patch new file mode 100644 index 0000000..e5153b5 --- /dev/null +++ b/patches/strace/4.10/003_aarch64_arch_regs.patch @@ -0,0 +1,25 @@ +commit 64fc9cedc475b2fc0d940509dc4232b02b5f83ec +Author: Andreas Schwab <schwab@suse.de> +Date: Thu Mar 12 11:54:08 2015 +0100 + + Distribute linux/aarch64/arch_regs.h + + * Makefile.am (EXTRA_DIST): Add linux/aarch64/arch_regs.h. + +diff --git a/Makefile.am b/Makefile.am +index 2030f9b..48fe1d7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -164,6 +164,7 @@ EXTRA_DIST = \ + linux/32/syscallent.h \ + linux/64/ioctls_inc.h \ + linux/64/syscallent.h \ ++ linux/aarch64/arch_regs.h \ + linux/aarch64/errnoent1.h \ + linux/aarch64/ioctls_arch0.h \ + linux/aarch64/ioctls_arch1.h \ +--- a/linux/aarch64/arch_regs.h 2015-06-09 03:27:46.170000000 +0000 ++++ b/linux/aarch64/arch_regs.h 2015-07-01 21:23:17.025202308 +0000 +@@ -0,0 +1,2 @@ ++extern uint64_t *const aarch64_sp_ptr; ++extern uint32_t *const arm_sp_ptr; diff --git a/patches/strace/4.10/004_stat64-v.test.patch b/patches/strace/4.10/004_stat64-v.test.patch new file mode 100644 index 0000000..53383e3 --- /dev/null +++ b/patches/strace/4.10/004_stat64-v.test.patch @@ -0,0 +1,87 @@ +commit f79252f072a193bdff435afeaa6b6cd6d5c79947 +Author: Dmitry V. Levin <ldv@altlinux.org> +Date: Mon Mar 16 17:18:40 2015 +0000 + + stat64-v.test: add newfstatat syscall support + + Newer architectures have no stat syscall, so stat() is implemented there + using newfstatat syscall. + + * tests/stat.c (STAT_FNAME): Rename to STAT_PREFIX. Update callers. + [_FILE_OFFSET_BITS == 64] (STAT_PREFIX): Add newfstatat support. + (main) [!NR_stat]: Add newfstatat support. + + Reported-by: Andreas Schwab <schwab@suse.de> + +diff --git a/tests/stat.c b/tests/stat.c +index 21e37fb..2b04010 100644 +--- a/tests/stat.c ++++ b/tests/stat.c +@@ -14,22 +14,22 @@ + # include <sys/types.h> + #endif + +-#undef STAT_FNAME ++#undef STAT_PREFIX + #undef NR_stat + + #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 + # include <sys/stat.h> +-# define STAT_FNAME "stat(64)?" ++# define STAT_PREFIX "(stat(64)?\\(|newfstatat\\(AT_FDCWD, )" + #else + # include <sys/syscall.h> + # if defined __NR_stat + # define NR_stat __NR_stat +-# define STAT_FNAME "stat" ++# define STAT_PREFIX "stat\\(" + # elif defined __NR_newstat + # define NR_stat __NR_newstat +-# define STAT_FNAME "newstat" ++# define STAT_PREFIX "newstat\\(" + # endif +-# ifdef STAT_FNAME ++# ifdef STAT_PREFIX + /* for S_IFMT */ + # define stat libc_stat + # define stat64 libc_stat64 +@@ -57,10 +57,10 @@ + # define off_t __kernel_off_t + # define loff_t __kernel_loff_t + # include <asm/stat.h> +-# endif /* STAT_FNAME */ ++# endif /* STAT_PREFIX */ + #endif /* _FILE_OFFSET_BITS */ + +-#ifdef STAT_FNAME ++#ifdef STAT_PREFIX + + static void + print_ftype(unsigned int mode) +@@ -115,7 +115,7 @@ main(int ac, const char **av) + assert(stat(av[1], &stb) == 0); + #endif + +- printf(STAT_FNAME "\\(\"%s\", \\{", av[1]); ++ printf(STAT_PREFIX "\"%s\", \\{", av[1]); + printf("st_dev=makedev\\(%u, %u\\)", + (unsigned int) major(stb.st_dev), + (unsigned int) minor(stb.st_dev)); +@@ -159,11 +159,15 @@ main(int ac, const char **av) + printf("(, st_flags=[0-9]+)?"); + printf("(, st_fstype=[^,]*)?"); + printf("(, st_gen=[0-9]+)?"); +- printf("\\}\\) += 0\n"); ++ printf("\\}"); ++#ifndef NR_stat ++ printf("(, 0)?"); ++#endif ++ printf("\\) += 0\n"); + return 0; + } + +-#else /* !STAT_FNAME */ ++#else /* !STAT_PREFIX */ + int main(void) + { + return 77; diff --git a/patches/strace/4.10/005_select_test.patch b/patches/strace/4.10/005_select_test.patch new file mode 100644 index 0000000..cb56ec6 --- /dev/null +++ b/patches/strace/4.10/005_select_test.patch @@ -0,0 +1,48 @@ +commit 95336102eb836ba69a2b51a3bbe733abd63bbe77 +Author: Andreas Schwab <schwab@suse.de> +Date: Thu Mar 12 16:47:38 2015 +0100 + + tests/select.test: handle architectures using pselect6 syscall + + * tests/select.awk (BEGIN): Update regexps to match both select + and pselect6 syscalls. + * tests/select.test: Probe for both select and pselect6 syscall. + +diff --git a/tests/select.awk b/tests/select.awk +index 142504a..688cefe 100644 +--- a/tests/select.awk ++++ b/tests/select.awk +@@ -1,7 +1,7 @@ + BEGIN { +- r[1] = "^select\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL\\) += 1 \\(\\)$" +- r[2] = "^select\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL\\) += -1 " +- r[3] = "^select\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100\\}\\) += 0 \\(Timeout\\)$" ++ r[1] = "^p?select6?\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL(, 0)?\\) += 1 \\(\\)$" ++ r[2] = "^p?select6?\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL(, 0)?\\) += -1 " ++ r[3] = "^p?select6?\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100(000)?\\}(, 0)?\\) += 0 \\(Timeout\\)$" + r[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$" + lines = 4 + fail = 0 +diff --git a/tests/select.test b/tests/select.test +index bd3066b..5d5fe54 100755 +--- a/tests/select.test ++++ b/tests/select.test +@@ -6,13 +6,16 @@ + + check_prog awk + +-$STRACE -eselect -h > /dev/null || ++syscall= ++$STRACE -epselect6 -h > /dev/null && syscall=$syscall,pselect6 ++$STRACE -eselect -h > /dev/null && syscall=$syscall,select ++test -n "$syscall" || + skip_ 'select syscall is not supported on this architecture' + + ./select || + framework_skip_ 'select syscall does not behave as expected' + +-args='-eselect ./select' ++args="-e$syscall ./select" + $STRACE -o "$LOG" $args || { + cat "$LOG" + fail_ "$STRACE $args failed" diff --git a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch new file mode 100644 index 0000000..a270349 --- /dev/null +++ b/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch @@ -0,0 +1,39 @@ +commit 0e3811d7914f209858cf4e445221fd65644cc94b +Author: Andreas Schwab <schwab@suse.de> +Date: Thu Mar 12 18:07:00 2015 +0100 + + aarch64: fix ioctl decoding + + * linux/aarch64/ioctls_inc0.h: Rename from ioctls_inc1.h. + * linux/aarch64/ioctls_inc1.h: Rename from ioctls_inc0.h. + * linux/aarch64/ioctls_arch0.h: Rename from ioctls_arch1.h. + * linux/aarch64/ioctls_arch1.h: Rename from ioctls_arch0.h. + +diff --git a/linux/aarch64/ioctls_arch0.h b/linux/aarch64/ioctls_arch0.h +index 6a674cc..b722d22 100644 +--- a/linux/aarch64/ioctls_arch0.h ++++ b/linux/aarch64/ioctls_arch0.h +@@ -1 +1 @@ +-/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */ ++#include "arm/ioctls_arch0.h" +diff --git a/linux/aarch64/ioctls_arch1.h b/linux/aarch64/ioctls_arch1.h +index b722d22..6a674cc 100644 +--- a/linux/aarch64/ioctls_arch1.h ++++ b/linux/aarch64/ioctls_arch1.h +@@ -1 +1 @@ +-#include "arm/ioctls_arch0.h" ++/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */ +diff --git a/linux/aarch64/ioctls_inc0.h b/linux/aarch64/ioctls_inc0.h +index f9939fa..46c11b1 100644 +--- a/linux/aarch64/ioctls_inc0.h ++++ b/linux/aarch64/ioctls_inc0.h +@@ -1 +1 @@ +-#include "64/ioctls_inc.h" ++#include "arm/ioctls_inc0.h" +diff --git a/linux/aarch64/ioctls_inc1.h b/linux/aarch64/ioctls_inc1.h +index 46c11b1..f9939fa 100644 +--- a/linux/aarch64/ioctls_inc1.h ++++ b/linux/aarch64/ioctls_inc1.h +@@ -1 +1 @@ +-#include "arm/ioctls_inc0.h" ++#include "64/ioctls_inc.h" diff --git a/patches/strace/4.10/007_fix_bexecve64_test.patch b/patches/strace/4.10/007_fix_bexecve64_test.patch new file mode 100644 index 0000000..09cd8ad --- /dev/null +++ b/patches/strace/4.10/007_fix_bexecve64_test.patch @@ -0,0 +1,18 @@ +--- a/tests/bexecve.test ++++ b/tests/bexecve.test +@@ -24,13 +24,14 @@ + } + + pattern='Process [1-9][0-9]* detached' ++pattern_personality='\[ Process PID=[1-9][0-9]* runs in .* mode. \]' + + LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null || { + cat "$LOG" + fail_ "$what: unexpected output" + } + +-if LC_ALL=C grep -v -x "$pattern" "$LOG" > /dev/null; then ++if LC_ALL=C grep -E -v -x "($pattern|$pattern_personality)" "$LOG" > /dev/null; then + cat "$LOG" + fail_ "$what: unexpected output" + fi diff --git a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch new file mode 100644 index 0000000..de0004c --- /dev/null +++ b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch @@ -0,0 +1,64 @@ +Index: strace-4.10/linux/mips/syscallent-o32.h +=================================================================== +--- strace-4.10.orig/linux/mips/syscallent-o32.h ++++ strace-4.10/linux/mips/syscallent-o32.h +@@ -1,6 +1,6 @@ + #if defined LINUX_MIPSO32 + /* For an O32 strace, decode the o32 syscalls. */ +-[4000] = { MA, 0, printargs, "syscall" }, /* start of Linux o32 */ ++[4000] = { MA, 0, sys_syscall, "syscall" }, /* start of Linux o32 */ + [4001] = { 1, TP|SE, sys_exit, "exit" }, + [4002] = { 0, TP, sys_fork, "fork" }, + [4003] = { 3, TD, sys_read, "read" }, +Index: strace-4.10/syscall.c +=================================================================== +--- strace-4.10.orig/syscall.c ++++ strace-4.10/syscall.c +@@ -606,6 +606,25 @@ decode_ipc_subcall(struct tcb *tcp) + } + #endif + ++#ifdef LINUX_MIPSO32 ++static void ++decode_mips_subcall(struct tcb *tcp) ++{ ++ if (!SCNO_IS_VALID(tcp->u_arg[0])) ++ return; ++ tcp->scno = tcp->u_arg[0]; ++ tcp->qual_flg = qual_flags[tcp->scno]; ++ tcp->s_ent = &sysent[tcp->scno]; ++ memmove(&tcp->u_arg[0], &tcp->u_arg[1], ++ sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0])); ++} ++ ++int sys_syscall(struct tcb *tcp) ++{ ++ return printargs(tcp); ++} ++#endif ++ + int + printargs(struct tcb *tcp) + { +@@ -1774,6 +1793,11 @@ trace_syscall_entering(struct tcb *tcp) + goto ret; + } + ++#ifdef LINUX_MIPSO32 ++ if (sys_syscall == tcp->s_ent->sys_func) ++ decode_mips_subcall(tcp); ++#endif ++ + if ( sys_execve == tcp->s_ent->sys_func + # if defined(SPARC) || defined(SPARC64) + || sys_execv == tcp->s_ent->sys_func +--- strace-4.10.orig/linux/syscall.h 2015-02-06 01:23:05.000000000 +0000 ++++ strace-4.10/linux/syscall.h 2015-07-09 14:36:49.372494628 +0100 +@@ -277,6 +277,7 @@ + int sys_symlinkat(); + int sys_sync_file_range(); + int sys_sync_file_range2(); ++int sys_syscall(); + int sys_sysctl(); + int sys_sysinfo(); + int sys_syslog(); |