public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Hannes Domani <ssbssa@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb/gdb-14-branch] Fix DLL export forwarding
Date: Wed,  6 Dec 2023 20:14:16 +0000 (GMT)	[thread overview]
Message-ID: <20231206201416.20AC53858CD1@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=43a608adb04251be8999304cf724f55b2d840ac3

commit 43a608adb04251be8999304cf724f55b2d840ac3
Author: Hannes Domani <ssbssa@yahoo.de>
Date:   Wed Dec 6 20:52:06 2023 +0100

    Fix DLL export forwarding
    
    I noticed it when I was trying to set a breakpoint at ExitProcess:
    ```
    (gdb) b ExitProcess
    Breakpoint 1 at 0x14001fdd0
    (gdb) r
    Starting program: C:\qiewer\heob\heob64.exe
    Warning:
    Cannot insert breakpoint 1.
    Cannot access memory at address 0x3dbf4120
    Cannot insert breakpoint 1.
    Cannot access memory at address 0x77644120
    ```
    
    The problem doesn't exist in gdb 13.2, and the difference can easily be
    seen when printing ExitProcess.
    gdb 14.1:
    ```
    (gdb) p ExitProcess
    $1 = {<text variable, no debug info>} 0x77644120 <UserHandleGrantAccess+36128>
    ```
    gdb 13.2:
    ```
    (gdb) p ExitProcess
    $1 = {<text variable, no debug info>} 0x77734120 <ntdll!RtlExitUserProcess>
    ```
    
    The new behavior started with 9675da25357c7a3f472731ddc6eb3becc65b469a,
    where VMA was then calculated relative to FORWARD_DLL_NAME, while it was
    relative to DLL_NAME before.
    
    Fixed by calculating VMA relative to DLL_NAME again.
    
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31112
    Approved-By: Tom Tromey <tom@tromey.com>
    
    (cherry picked from commit 2574cd903dd84e7081506e24c2e232ecda11a736)

Diff:
---
 gdb/coff-pe-read.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 56137ac4dd0..8e30c6a4a61 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -210,7 +210,10 @@ add_pe_forwarded_sym (minimal_symbol_reader &reader,
 			      " \"%s\" in dll \"%s\", pointing to \"%s\"\n"),
 		sym_name, dll_name, forward_qualified_name.c_str ());
 
-  unrelocated_addr vma = msymbol.minsym->unrelocated_address ();
+  /* Calculate VMA as if it were relative to DLL_NAME/OBJFILE, even though
+     it actually points inside another dll (FORWARD_DLL_NAME).  */
+  unrelocated_addr vma = unrelocated_addr (msymbol.value_address ()
+					   - objfile->text_section_offset ());
   msymtype = msymbol.minsym->type ();
   section = msymbol.minsym->section_index ();

                 reply	other threads:[~2023-12-06 20:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231206201416.20AC53858CD1@sourceware.org \
    --to=ssbssa@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).