From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13631 invoked by alias); 13 Aug 2008 15:50:46 -0000 Received: (qmail 13623 invoked by uid 22791); 13 Aug 2008 15:50:45 -0000 X-Spam-Check-By: sourceware.org Received: from main.gmane.org (HELO ciao.gmane.org) (80.91.229.2) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 13 Aug 2008 15:50:06 +0000 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1KTIbq-0000cs-9d for gdb-patches@sources.redhat.com; Wed, 13 Aug 2008 15:50:02 +0000 Received: from enigma.qnx.com ([209.226.137.106]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Aug 2008 15:50:02 +0000 Received: from aristovski by enigma.qnx.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 13 Aug 2008 15:50:02 +0000 To: gdb-patches@sources.redhat.com From: Aleksandar Ristovski Subject: Re: [patch] nto target: fix null pointer dereference Date: Wed, 13 Aug 2008 15:50:00 -0000 Message-ID: <48A301C7.7050306@qnx.com> References: <200808131329.m7DDTCWK022235@d12av02.megacenter.de.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030201020104070203090106" User-Agent: Thunderbird 2.0.0.16 (Windows/20080708) In-Reply-To: <200808131329.m7DDTCWK022235@d12av02.megacenter.de.ibm.com> X-IsSubscribed: yes 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: 2008-08/txt/msg00350.txt.bz2 This is a multi-part message in MIME format. --------------030201020104070203090106 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 480 Ulrich Weigand wrote: > > It seems the main problem is that NTO at some time copied some of > the logic from solib-svr4.c, but has not adapted to the changes that > were added to that file later on. Not even the definition of struct > lm_info matches any more! > > Maybe a more correct fix would be to mimic the new solib-svr4.c logic > and use the l_addr field to cache the load address? > You are right. This is what I did in the new patch (attached). Thanks, Aleksandar --------------030201020104070203090106 Content-Type: text/plain; name="nto-tdep.c.200808131121.diff.ChangeLog" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="nto-tdep.c.200808131121.diff.ChangeLog" Content-length: 193 2008-08-13 Aleksandar Ristovski * nto-tdep.c (lm_info): Updated struct lm_info definition from solib-svr4.c (LM_ADDR): Use l_addr if available; if not, use link map. --------------030201020104070203090106 Content-Type: text/plain; name="nto-tdep.c.200808131121.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="nto-tdep.c.200808131121.diff" Content-length: 1969 Index: gdb/nto-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/nto-tdep.c,v retrieving revision 1.25 diff -u -p -r1.25 nto-tdep.c --- gdb/nto-tdep.c 23 Jul 2008 13:36:00 -0000 1.25 +++ gdb/nto-tdep.c 13 Aug 2008 15:21:20 -0000 @@ -253,21 +253,39 @@ nto_parse_redirection (char *pargv[], co solib-svr4.c to support nto_relocate_section_addresses which is different from the svr4 version. */ +/* Link map info to include in an allocated so_list entry */ + struct lm_info -{ - /* Pointer to copy of link map from inferior. The type is char * - rather than void *, so that we may use byte offsets to find the - various fields without the need for a cast. */ - char *lm; -}; + { + /* Pointer to copy of link map from inferior. The type is char * + rather than void *, so that we may use byte offsets to find the + various fields without the need for a cast. */ + gdb_byte *lm; + + /* Amount by which addresses in the binary should be relocated to + match the inferior. This could most often be taken directly + from lm, but when prelinking is involved and the prelink base + address changes, we may need a different offset, we want to + warn about the difference and compute it only once. */ + CORE_ADDR l_addr; + + /* The target location of lm. */ + CORE_ADDR lm_addr; + }; + static CORE_ADDR LM_ADDR (struct so_list *so) { - struct link_map_offsets *lmo = nto_fetch_link_map_offsets (); + if (so->lm_info->l_addr == (CORE_ADDR)-1) + { + struct link_map_offsets *lmo = nto_fetch_link_map_offsets (); - return extract_typed_address (so->lm_info->lm + lmo->l_addr_offset, - builtin_type_void_data_ptr); + return extract_typed_address (so->lm_info->lm + lmo->l_addr_offset, + builtin_type_void_data_ptr); + } + else + return so->lm_info->l_addr; } static CORE_ADDR --------------030201020104070203090106--