Author: markj
Date: Wed Jul 20 00:53:21 2016
New Revision: 303058
URL: https://svnweb.freebsd.org/changeset/base/303058
Log:
MFC r302179:
gcore: Forward pending signals when detaching from the target.
Modified:
stable/10/usr.bin/gcore/elfcore.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/gcore/elfcore.c
==============================================================================
--- stable/10/usr.bin/gcore/elfcore.c Wed Jul 20 00:52:11 2016
(r303057)
+++ stable/10/usr.bin/gcore/elfcore.c Wed Jul 20 00:53:21 2016
(r303058)
@@ -123,6 +123,7 @@ static vm_map_entry_t readmap(pid_t);
static void *procstat_sysctl(void *, int, size_t, size_t *sizep);
static pid_t g_pid; /* Pid being dumped, global for elf_detach */
+static int g_status; /* proc status after ptrace attach */
static int
elf_ident(int efd, pid_t pid __unused, char *binfile __unused)
@@ -156,9 +157,18 @@ elf_ident(int efd, pid_t pid __unused, c
static void
elf_detach(void)
{
+ int sig;
- if (g_pid != 0)
- ptrace(PT_DETACH, g_pid, (caddr_t)1, 0);
+ if (g_pid != 0) {
+ /*
+ * Forward any pending signals. SIGSTOP is generated by ptrace
+ * itself, so ignore it.
+ */
+ sig = WIFSTOPPED(g_status) ? WSTOPSIG(g_status) : 0;
+ if (sig == SIGSTOP)
+ sig = 0;
+ ptrace(PT_DETACH, g_pid, (caddr_t)1, sig);
+ }
}
/*
@@ -184,7 +194,7 @@ elf_coredump(int efd __unused, int fd, p
ptrace(PT_ATTACH, pid, NULL, 0);
if (errno)
err(1, "PT_ATTACH");
- if (waitpid(pid, NULL, 0) == -1)
+ if (waitpid(pid, &g_status, 0) == -1)
err(1, "waitpid");
/* Get the program's memory map. */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
