Skip to content

Commit 3295ff3

Browse files
committed
gdbserver: switch to right process in find_one_thread
New in this version: add a dedicated test. When I do this: $ ./gdb -nx --data-directory=data-directory -q \ /bin/sleep \ -ex "maint set target-non-stop on" \ -ex "tar ext :1234" \ -ex "set remote exec-file /bin/sleep" \ -ex "run 1231 &" \ -ex add-inferior \ -ex "inferior 2" Reading symbols from /bin/sleep... (No debugging symbols found in /bin/sleep) Remote debugging using :1234 Starting program: /bin/sleep 1231 Reading /lib64/ld-linux-x86-64.so.2 from remote target... warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead. Reading /lib64/ld-linux-x86-64.so.2 from remote target... Reading /usr/lib/debug/.build-id/a6/7a1408f18db3576757eea210d07ba3fc560dff.debug from remote target... [New inferior 2] Added inferior 2 on connection 1 (extended-remote :1234) [Switching to inferior 2 [<null>] (<noexec>)] (gdb) Reading /lib/x86_64-linux-gnu/libc.so.6 from remote target... attach 3659848 Attaching to process 3659848 /home/smarchi/src/binutils-gdb/gdb/thread.c:85: internal-error: inferior_thread: Assertion `current_thread_ != nullptr' failed. Note the "attach" command just above. When doing it on the command-line with a -ex switch, the bug doesn't trigger. The internal error of GDB is actually caused by GDBserver crashing, and the error recovery of GDB is not on point. This patch aims to fix just the GDBserver crash, not the GDB problem. GDBserver crashes with a segfault here: (gdb) bt #0 0x00005555557fb3f4 in find_one_thread (ptid=...) at /home/smarchi/src/binutils-gdb/gdbserver/thread-db.cc:177 #1 0x00005555557fd5cf in thread_db_thread_handle (ptid=<error reading variable: Cannot access memory at address 0xffffffffffffffa0>, handle=0x7fffffffc400, handle_len=0x7fffffffc3f0) at /home/smarchi/src/binutils-gdb/gdbserver/thread-db.cc:461 #2 0x000055555578a0b6 in linux_process_target::thread_handle (this=0x5555558a64c0 <the_x86_target>, ptid=<error reading variable: Cannot access memory at address 0xffffffffffffffa0>, handle=0x7fffffffc400, handle_len=0x7fffffffc3f0) at /home/smarchi/src/binutils-gdb/gdbserver/linux-low.cc:6905 #3 0x00005555556dfcc6 in handle_qxfer_threads_worker (thread=0x60b000000510, buffer=0x7fffffffc8a0) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:1645 bminor#4 0x00005555556e00e6 in operator() (__closure=0x7fffffffc5e0, thread=0x60b000000510) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:1696 bminor#5 0x00005555556f54be in for_each_thread<handle_qxfer_threads_proper(buffer*)::<lambda(thread_info*)> >(struct {...}) (func=...) at /home/smarchi/src/binutils-gdb/gdbserver/gdbthread.h:159 bminor#6 0x00005555556e0242 in handle_qxfer_threads_proper (buffer=0x7fffffffc8a0) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:1694 bminor#7 0x00005555556e04ba in handle_qxfer_threads (annex=0x629000000213 "", readbuf=0x621000019100 '\276' <repeats 200 times>..., writebuf=0x0, offset=0, len=4097) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:1732 bminor#8 0x00005555556e1989 in handle_qxfer (own_buf=0x629000000200 "qXfer:threads", packet_len=26, new_packet_len_p=0x7fffffffd630) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:2045 bminor#9 0x00005555556e720a in handle_query (own_buf=0x629000000200 "qXfer:threads", packet_len=26, new_packet_len_p=0x7fffffffd630) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:2685 bminor#10 0x00005555556f1a01 in process_serial_event () at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:4176 bminor#11 0x00005555556f4457 in handle_serial_event (err=0, client_data=0x0) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:4514 bminor#12 0x0000555555820f56 in handle_file_event (file_ptr=0x607000000250, ready_mask=1) at /home/smarchi/src/binutils-gdb/gdbsupport/event-loop.cc:573 bminor#13 0x0000555555821895 in gdb_wait_for_event (block=1) at /home/smarchi/src/binutils-gdb/gdbsupport/event-loop.cc:694 bminor#14 0x000055555581f533 in gdb_do_one_event (mstimeout=-1) at /home/smarchi/src/binutils-gdb/gdbsupport/event-loop.cc:264 bminor#15 0x00005555556ec9fb in start_event_loop () at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:3512 bminor#16 0x00005555556f0769 in captured_main (argc=4, argv=0x7fffffffe0d8) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:3992 #17 0x00005555556f0e3f in main (argc=4, argv=0x7fffffffe0d8) at /home/smarchi/src/binutils-gdb/gdbserver/server.cc:4078 The reason is a wrong current process when find_one_thread is called. The current process is the 2nd one, which was just attached. It does not yet have thread_db data (proc->priv->thread_db is nullptr). As we iterate on all threads of all process to fulfull the qxfer:threads:read request, we get to a thread of process 1 for which we haven't read thread_db information yet (lwp_info::thread_known is false), so we get into find_one_thread. find_one_thread uses `current_process ()->priv->thread_db`, assuming the current process matches the ptid passed as a parameter, which is wrong. A segfault happens when trying to dereference that thread_db pointer. Fix this by making find_one_thread not assume what the current process / current thread is. If it needs to call into libthread_db, which we know will try to read memory from the current process, then temporarily set the current process. In the case where the thread is already know and we return early, we don't need to switch process. Add a test to reproduce this specific situation. Change-Id: I09b00883e8b73b7e5f89d0f47cb4e9c0f3d6caaa Approved-By: Andrew Burgess <aburgess@redhat.com>
1 parent b70e927 commit 3295ff3

File tree

3 files changed

+112
-12
lines changed

3 files changed

+112
-12
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* This testcase is part of GDB, the GNU debugger.
2+
3+
Copyright 2022 Free Software Foundation, Inc.
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation; either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>. */
17+
18+
#include <unistd.h>
19+
20+
int global_var = 123;
21+
22+
int
23+
main (void)
24+
{
25+
sleep (30);
26+
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Copyright 2022 Free Software Foundation, Inc.
2+
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 3 of the License, or
6+
# (at your option) any later version.
7+
#
8+
# This program is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
# GNU General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU General Public License
14+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
# This test was introduced to reproduce a specific bug in GDBserver, where
17+
# attaching an inferior while another one was running would trigger a segfault
18+
# in GDBserver. Reproducing the bug required specific circumstances:
19+
#
20+
# - The first process must be far enough to have loaded its libc or
21+
# libpthread (whatever triggers the loading of libthread_db), such that
22+
# its proc->priv->thread_db is not nullptr
23+
#
24+
# - However, its lwp must still be in the `!lwp->thread_known` state,
25+
# meaning GDBserver hasn't asked libthread_db to compute the thread
26+
# handle yet. That means, GDB must not have refreshed the thread list
27+
# yet, since that would cause the thread handles to be computed. That
28+
# means, no stopping on a breakpoint, since that causes a thread list
29+
# update. That's why the first inferior needs to be started with "run
30+
# &".
31+
#
32+
# - Attaching the second process would segfault GDBserver.
33+
#
34+
# All of this to say, if modifying this test, please keep in mind the original
35+
# intent.
36+
37+
standard_testfile
38+
39+
if [use_gdb_stub] {
40+
unsupported "test requires running"
41+
return
42+
}
43+
44+
if { [build_executable "failed to prepare" ${testfile} ${srcfile}] } {
45+
return
46+
}
47+
48+
proc do_test {} {
49+
save_vars { $::GDBFLAGS } {
50+
append ::GDBFLAGS " -ex \"maint set target-non-stop on\""
51+
clean_restart $::binfile
52+
}
53+
54+
gdb_test -no-prompt-anchor "run &"
55+
gdb_test "add-inferior" "Added inferior 2 on connection 1 .*"
56+
gdb_test "inferior 2" "Switching to inferior 2 .*"
57+
58+
set spawn_id [spawn_wait_for_attach $::binfile]
59+
set pid [spawn_id_get_pid $spawn_id]
60+
61+
# This call would crash GDBserver.
62+
gdb_attach $pid
63+
64+
# Read a variable from the inferior, just to make sure the attach worked
65+
# fine.
66+
gdb_test "print global_var" " = 123"
67+
}
68+
69+
do_test

gdbserver/thread-db.cc

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,30 +155,35 @@ thread_db_state_str (td_thr_state_e state)
155155
}
156156
#endif
157157

158-
/* Get thread info about PTID, accessing memory via the current
159-
thread. */
158+
/* Get thread info about PTID. */
160159

161160
static int
162161
find_one_thread (ptid_t ptid)
163162
{
164-
td_thrhandle_t th;
165-
td_thrinfo_t ti;
166-
td_err_e err;
167-
struct lwp_info *lwp;
168-
struct thread_db *thread_db = current_process ()->priv->thread_db;
169-
int lwpid = ptid.lwp ();
170-
171163
thread_info *thread = find_thread_ptid (ptid);
172-
lwp = get_thread_lwp (thread);
164+
lwp_info *lwp = get_thread_lwp (thread);
173165
if (lwp->thread_known)
174166
return 1;
175167

176-
/* Get information about this thread. */
177-
err = thread_db->td_ta_map_lwp2thr_p (thread_db->thread_agent, lwpid, &th);
168+
/* Get information about this thread. libthread_db will need to read some
169+
memory, which will be done on the current process, so make PTID's process
170+
the current one. */
171+
process_info *proc = find_process_pid (ptid.pid ());
172+
gdb_assert (proc != nullptr);
173+
174+
scoped_restore_current_thread restore_thread;
175+
switch_to_process (proc);
176+
177+
thread_db *thread_db = proc->priv->thread_db;
178+
td_thrhandle_t th;
179+
int lwpid = ptid.lwp ();
180+
td_err_e err = thread_db->td_ta_map_lwp2thr_p (thread_db->thread_agent, lwpid,
181+
&th);
178182
if (err != TD_OK)
179183
error ("Cannot get thread handle for LWP %d: %s",
180184
lwpid, thread_db_err_str (err));
181185

186+
td_thrinfo_t ti;
182187
err = thread_db->td_thr_get_info_p (&th, &ti);
183188
if (err != TD_OK)
184189
error ("Cannot get thread info for LWP %d: %s",

0 commit comments

Comments
 (0)