From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23521 invoked by alias); 3 Apr 2009 18:07:06 -0000 Received: (qmail 23512 invoked by uid 22791); 3 Apr 2009 18:07:05 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mtagate3.de.ibm.com (HELO mtagate3.de.ibm.com) (195.212.29.152) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Apr 2009 18:06:59 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.14.3/8.13.8) with ESMTP id n33I6u2s052326 for ; Fri, 3 Apr 2009 18:06:56 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 n33I6udc3997818 for ; Fri, 3 Apr 2009 20:06:56 +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 n33I6u0m016931 for ; Fri, 3 Apr 2009 20:06:56 +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 n33I6tjw016918; Fri, 3 Apr 2009 20:06:55 +0200 Message-Id: <200904031806.n33I6tjw016918@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 03 Apr 2009 20:06:55 +0200 Subject: [rfa/gdbserver] Updated: Fix crash in thread_db_get_tls_address To: gdb-patches@sourceware.org, drow@false.org, dje@google.com Date: Fri, 03 Apr 2009 18:07:00 -0000 From: "Ulrich Weigand" In-Reply-To: from "Doug Evans" at Jan 22, 2009 05:08:32 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/msg00077.txt.bz2 Doug Evans wrote: > On Thu, Jan 22, 2009 at 7:05 AM, Ulrich Weigand wrote: > > Doug Evans wrote: > > > >> Hi. I've run into similar situations with the thread layer not yet > >> initialized. One aspect of this patch is a bit confusing. Maybe a > >> comment is warranted. > >> > >> Returning -1 will cause server.c:handle_query to mark the packet as > >> unknown which will in turn cause remote.c:packet_ok to mark the packet > >> as disabled (on the gdb side). How does the packet get re-enabled if > >> the thread layer is later initialized? > > > > You're right -- I missed that. I guess we need to report an error > > instead of marking the packet as unknown. > > > > The following patch is changed to use TD_ERR ("generic error" seems to > > be the best response -- I don't see a more specific code that would be > > appropriate here). > > > > Retested on powerpc64-linux (64-bit / 32-bit) with local gdbserver. > > I don't know if there's a better value to use here either. Maybe > TD_TLSDEFER, but I'm just guessing (and I don't know how portable it > is). TD_TLSDEFER doesn't seem to be available everywhere, and has a somewhat different meaning, I think. In any case, it doesn't really matter, as GDB will currently throw a TLS_GENERIC_ERROR in remote.c no matter what error code is returned ... I've updated the patch to account for multi-process changes. Retested on powerpc64-linux (64-bit / 32-bit) with local gdbserver. Dan, is this OK for mainline? Bye, Ulrich ChangeLog: * thread-db.c (thread_db_get_tls_address): Do not crash if called when thread layer is not yet initialized. Index: src/gdb/gdbserver/thread-db.c =================================================================== --- src.orig/gdb/gdbserver/thread-db.c +++ src/gdb/gdbserver/thread-db.c @@ -382,6 +382,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 (!current_process()->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