Attachment 155329 Details for Bug 240962 – Bugfix updated according to the Roland's comments.

[patch] Bugfix updated according to the Roland's comments.

strace-4.5.15-tkill.patch (text/plain), 1.69 KB, created by Jan Kratochvil on 2007-05-24 09:40:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2007-05-24 09:40:30 UTC

Size: 1.69 KB

patch

obsolete

>2007-05-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
>	    Roland McGrath  <roland@redhat.com>
>
>	* strace.c [LINUX] (my_tgkill): New definition.
>	[LINUX] (detach): Use my_tgkill () instead of kill(2).
>	Fixes RH#240962.
>
>diff -u -rup strace-4.5.15-orig/strace.c strace-4.5.15-tkill/strace.c
>--- strace-4.5.15-orig/strace.c	2006-12-13 22:55:39.000000000 +0100
>+++ strace-4.5.15-tkill/strace.c	2007-05-24 11:26:18.000000000 +0200
>@@ -46,6 +46,22 @@
> #include <limits.h>
> #include <dirent.h>
> 
>+#ifdef LINUX
>+# include <unistd.h>
>+# include <asm/unistd.h>
>+# if defined __NR_tgkill
>+#  define my_tgkill(pid, tid, sig) syscall (__NR_tgkill, (pid), (tid), (sig))
>+# elif defined __NR_tkill
>+#  define my_tgkill(pid, tid, sig) syscall (__NR_tkill, (tid), (sig))
>+# else
>+   /* kill() may choose arbitrarily the target task of the process group
>+      while we later wait on a that specific TID.  PID process waits become
>+      TID task specific waits for a process under ptrace(2).  */
>+#  warning "Neither tkill(2) or tgkill(2) available, risk of strace hangs!"
>+#  define my_tgkill(pid, tid, sig) kill ((tid), (sig))
>+# endif
>+#endif
>+
> #if defined(IA64) && defined(LINUX)
> # include <asm/ptrace_offsets.h>
> #endif
>@@ -1322,11 +1338,13 @@ int sig;
> 		/* Shouldn't happen. */
> 		perror("detach: ptrace(PTRACE_DETACH, ...)");
> 	}
>-	else if (kill(tcp->pid, 0) < 0) {
>+	else if (my_tgkill((tcp->parent ? tcp->parent->pid : tcp->pid),
>+			   tcp->pid, 0) < 0) {
> 		if (errno != ESRCH)
> 			perror("detach: checking sanity");
> 	}
>-	else if (kill(tcp->pid, SIGSTOP) < 0) {
>+	else if (my_tgkill((tcp->parent ? tcp->parent->pid : tcp->pid),
>+			   tcp->pid, SIGSTOP) < 0) {
> 		if (errno != ESRCH)
> 			perror("detach: stopping child");
> 	}

Actions: View | Diff

Attachments on bug 240962: 155244 | 155246 | 155329 | 155354