mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
183be22290
I stumbled on a bug caused by the fact that a code path read target_waitstatus::value::sig (expecting it to contain a gdb_signal value) while target_waitstatus::kind was TARGET_WAITKIND_FORKED. This meant that the active union field was in fact target_waitstatus::value::related_pid, and contained a ptid. The read signal value was therefore garbage, and that caused GDB to crash soon after. Or, since that GDB was built with ubsan, this nice error message: /home/simark/src/binutils-gdb/gdb/linux-nat.c:1271:12: runtime error: load of value 2686365, which is not a valid value for type 'gdb_signal' Despite being a large-ish change, I think it would be nice to make target_waitstatus safe against that kind of bug. As already done elsewhere (e.g. dynamic_prop), validate that the type of value read from the union matches what is supposed to be the active field. - Make the kind and value of target_waitstatus private. - Make the kind initialized to TARGET_WAITKIND_IGNORE on target_waitstatus construction. This is what most users appear to do explicitly. - Add setters, one for each kind. Each setter takes as a parameter the data associated to that kind, if any. This makes it impossible to forget to attach the associated data. - Add getters, one for each associated data type. Each getter validates that the data type fetched by the user matches the wait status kind. - Change "integer" to "exit_status", "related_pid" to "child_ptid", just because that's more precise terminology. - Fix all users. That last point is semi-mechanical. There are a lot of obvious changes, but some less obvious ones. For example, it's not possible to set the kind at some point and the associated data later, as some users did. But in any case, the intent of the code should not change in this patch. This was tested on x86-64 Linux (unix, native-gdbserver and native-extended-gdbserver boards). It was built-tested on x86-64 FreeBSD, NetBSD, MinGW and macOS. The rest of the changes to native files was done as a best effort. If I forgot any place to update in these files, it should be easy to fix (unless the change happens to reveal an actual bug). Change-Id: I0ae967df1ff6e28de78abbe3ac9b4b2ff4ad03b7
185 lines
4.6 KiB
C
185 lines
4.6 KiB
C
/* Native-dependent code for OpenBSD.
|
|
|
|
Copyright (C) 2012-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "gdbthread.h"
|
|
#include "inferior.h"
|
|
#include "target.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/ptrace.h>
|
|
#include "gdbsupport/gdb_wait.h"
|
|
|
|
#include "inf-ptrace.h"
|
|
#include "obsd-nat.h"
|
|
|
|
/* OpenBSD 5.2 and later include rthreads which uses a thread model
|
|
that maps userland threads directly onto kernel threads in a 1:1
|
|
fashion. */
|
|
|
|
std::string
|
|
obsd_nat_target::pid_to_str (ptid_t ptid)
|
|
{
|
|
if (ptid.lwp () != 0)
|
|
return string_printf ("thread %ld of process %d", ptid.lwp (), ptid.pid ());
|
|
|
|
return normal_pid_to_str (ptid);
|
|
}
|
|
|
|
void
|
|
obsd_nat_target::update_thread_list ()
|
|
{
|
|
pid_t pid = inferior_ptid.pid ();
|
|
struct ptrace_thread_state pts;
|
|
|
|
prune_threads ();
|
|
|
|
if (ptrace (PT_GET_THREAD_FIRST, pid, (caddr_t)&pts, sizeof pts) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
while (pts.pts_tid != -1)
|
|
{
|
|
ptid_t ptid = ptid_t (pid, pts.pts_tid, 0);
|
|
|
|
if (!in_thread_list (this, ptid))
|
|
{
|
|
if (inferior_ptid.lwp () == 0)
|
|
thread_change_ptid (this, inferior_ptid, ptid);
|
|
else
|
|
add_thread (this, ptid);
|
|
}
|
|
|
|
if (ptrace (PT_GET_THREAD_NEXT, pid, (caddr_t)&pts, sizeof pts) == -1)
|
|
perror_with_name (("ptrace"));
|
|
}
|
|
}
|
|
|
|
/* Enable additional event reporting on a new or existing process. */
|
|
|
|
static void
|
|
obsd_enable_proc_events (pid_t pid)
|
|
{
|
|
ptrace_event_t pe;
|
|
|
|
/* Set the initial event mask. */
|
|
memset (&pe, 0, sizeof pe);
|
|
pe.pe_set_event |= PTRACE_FORK;
|
|
if (ptrace (PT_SET_EVENT_MASK, pid,
|
|
(PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
|
|
perror_with_name (("ptrace"));
|
|
}
|
|
|
|
ptid_t
|
|
obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|
|
target_wait_flags options)
|
|
{
|
|
ptid_t wptid = inf_ptrace_target::wait (ptid, ourstatus, options);
|
|
if (ourstatus->kind () == TARGET_WAITKIND_STOPPED)
|
|
{
|
|
ptrace_state_t pe;
|
|
|
|
pid_t pid = wptid.pid ();
|
|
if (ptrace (PT_GET_PROCESS_STATE, pid, (caddr_t)&pe, sizeof pe) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
wptid = ptid_t (pid, pe.pe_tid, 0);
|
|
|
|
switch (pe.pe_report_event)
|
|
{
|
|
case PTRACE_FORK:
|
|
ourstatus->set_forked (ptid_t (pe.pe_other_pid));
|
|
|
|
/* Make sure the other end of the fork is stopped too. */
|
|
pid_t fpid = waitpid (pe.pe_other_pid, nullptr, 0);
|
|
if (fpid == -1)
|
|
perror_with_name (("waitpid"));
|
|
|
|
if (ptrace (PT_GET_PROCESS_STATE, fpid,
|
|
(caddr_t)&pe, sizeof pe) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
gdb_assert (pe.pe_report_event == PTRACE_FORK);
|
|
gdb_assert (pe.pe_other_pid == pid);
|
|
if (find_inferior_pid (this, fpid) != nullptr)
|
|
{
|
|
ourstatus->set_forked (ptid_t (pe.pe_other_pid));
|
|
wptid = ptid_t (fpid, pe.pe_tid, 0);
|
|
}
|
|
|
|
obsd_enable_proc_events (ourstatus->child_ptid ().pid ());
|
|
break;
|
|
}
|
|
|
|
/* Ensure the ptid is updated with an LWP id on the first stop
|
|
of a process. */
|
|
if (!in_thread_list (this, wptid))
|
|
{
|
|
if (in_thread_list (this, ptid_t (pid)))
|
|
thread_change_ptid (this, ptid_t (pid), wptid);
|
|
else
|
|
add_thread (this, wptid);
|
|
}
|
|
}
|
|
return wptid;
|
|
}
|
|
|
|
void
|
|
obsd_nat_target::post_attach (int pid)
|
|
{
|
|
obsd_enable_proc_events (pid);
|
|
}
|
|
|
|
void
|
|
obsd_nat_target::post_startup_inferior (ptid_t pid)
|
|
{
|
|
obsd_enable_proc_events (pid.pid ());
|
|
}
|
|
|
|
/* Target hook for follow_fork. */
|
|
|
|
void
|
|
obsd_nat_target::follow_fork (inferior *child_inf, ptid_t child_ptid,
|
|
target_waitkind fork_kind,
|
|
bool follow_child, bool detach_fork)
|
|
{
|
|
inf_ptrace_target::follow_fork (child_inf, child_ptid, fork_kind,
|
|
follow_child, detach_fork);
|
|
|
|
if (!follow_child && detach_fork)
|
|
{
|
|
/* Breakpoints have already been detached from the child by
|
|
infrun.c. */
|
|
|
|
if (ptrace (PT_DETACH, child_ptid.pid (), (PTRACE_TYPE_ARG3)1, 0) == -1)
|
|
perror_with_name (("ptrace"));
|
|
}
|
|
}
|
|
|
|
int
|
|
obsd_nat_target::insert_fork_catchpoint (int pid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
obsd_nat_target::remove_fork_catchpoint (int pid)
|
|
{
|
|
return 0;
|
|
}
|