From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32083 invoked by alias); 3 Apr 2009 20:17:50 -0000 Received: (qmail 31653 invoked by uid 22791); 3 Apr 2009 20:17:48 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtagate7.de.ibm.com (HELO mtagate7.de.ibm.com) (195.212.29.156) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Apr 2009 20:17:42 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate7.de.ibm.com (8.14.3/8.13.8) with ESMTP id n33KHd5b530018 for ; Fri, 3 Apr 2009 20:17:39 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n33KHdYM3170432 for ; Fri, 3 Apr 2009 22:17:39 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n33KHdRg002872 for ; Fri, 3 Apr 2009 22:17:39 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id n33KHcjW002865; Fri, 3 Apr 2009 22:17:38 +0200 Message-Id: <200904032017.n33KHcjW002865@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 03 Apr 2009 22:17:38 +0200 Subject: Re: [rfa/gdbserver] Updated: Fix crash in thread_db_get_tls_address To: pedro@codesourcery.com (Pedro Alves) Date: Fri, 03 Apr 2009 20:17:00 -0000 From: "Ulrich Weigand" Cc: gdb-patches@sourceware.org, drow@false.org, dje@google.com In-Reply-To: <200904032024.46136.pedro@codesourcery.com> from "Pedro Alves" at Apr 03, 2009 08:24:45 PM MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-04/txt/msg00085.txt.bz2 Pedro Alves wrote: > A Friday 03 April 2009 20:20:09, Ulrich Weigand escreveu: > > Pedro Alves wrote: > > > > > The qGetTLSAddr packet takes an explicit thread id, so in this > > > case, it may be that the current process isn't the > > > correct one. I think in this case the best would be to > > > inferior.c:get_thread_process and use that, like: > > ^ export > > > > > > > if (!get_thread_process (thread)->all_symbols_looked_up) > > > return TD_ERR; > > > > That function is currently static to inferior.c; I guess it > > should be exported? > > Yes. That's what I meant, but fingers slipped. :-) > > > > Alternatively you could make sure you call current_process (), > > > after temporarily having switched the current inferior, like > > > we do a bit below. > > > > Hmm, I want to guard against find_one_thread blowing up due to > > a NULL proc->thread_agent -- but "proc" is always refering to > > current_process () as well. This is probably incorrect too, > > and find_one_thread ought to use get_thread_process? > > Indeed. OK, here's the version I've just committed. Retested on powerpc64-linux (64-bit and 32-bit) with local gdbserver. Thanks, Ulrich ChangeLog: * inferiors.c (get_thread_process): Make global. * server.h (get_thread_process): Add prototype. * thread-db.c (find_one_thread): Use get_thread_process instead of current_process. (thread_db_get_tls_address): Do not crash if called when thread layer is not yet initialized. Index: gdb/gdbserver/inferiors.c =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/inferiors.c,v retrieving revision 1.19 diff -u -p -r1.19 inferiors.c --- gdb/gdbserver/inferiors.c 1 Apr 2009 22:50:24 -0000 1.19 +++ gdb/gdbserver/inferiors.c 3 Apr 2009 19:47:11 -0000 @@ -442,7 +442,7 @@ find_process_pid (int pid) find_inferior_id (&all_processes, pid_to_ptid (pid)); } -static struct process_info * +struct process_info * get_thread_process (struct thread_info *thread) { int pid = ptid_get_pid (thread->entry.id); Index: gdb/gdbserver/server.h =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/server.h,v retrieving revision 1.55 diff -u -p -r1.55 server.h --- gdb/gdbserver/server.h 1 Apr 2009 22:50:24 -0000 1.55 +++ gdb/gdbserver/server.h 3 Apr 2009 19:47:11 -0000 @@ -201,6 +201,7 @@ struct process_info no current thread selected. */ struct process_info *current_process (void); +struct process_info *get_thread_process (struct thread_info *); #include "regcache.h" #include "gdb/signals.h" Index: gdb/gdbserver/thread-db.c =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/thread-db.c,v retrieving revision 1.22 diff -u -p -r1.22 thread-db.c --- gdb/gdbserver/thread-db.c 1 Apr 2009 22:50:24 -0000 1.22 +++ gdb/gdbserver/thread-db.c 3 Apr 2009 19:47:11 -0000 @@ -233,7 +233,7 @@ find_one_thread (ptid_t ptid) td_err_e err; struct thread_info *inferior; struct lwp_info *lwp; - struct process_info_private *proc = current_process()->private; + struct process_info_private *proc; int lwpid = ptid_get_lwp (ptid); inferior = (struct thread_info *) find_inferior_id (&all_threads, ptid); @@ -242,6 +242,7 @@ find_one_thread (ptid_t ptid) return 1; /* Get information about this thread. */ + proc = get_thread_process (inferior)->private; err = td_ta_map_lwp2thr (proc->thread_agent, lwpid, &th); if (err != TD_OK) error ("Cannot get thread handle for LWP %d: %s", @@ -382,6 +383,10 @@ thread_db_get_tls_address (struct thread struct lwp_info *lwp; struct thread_info *saved_inferior; + /* If the thread layer is not (yet) initialized, fail. */ + if (!get_thread_process (thread)->all_symbols_looked_up) + return TD_ERR; + lwp = get_thread_lwp (thread); if (!lwp->thread_known) find_one_thread (lwp->head.id); -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com