public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Keno Fischer <keno@juliacomputing.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] Add CFI to x86_64 RTLD_START
Date: Mon, 04 Jul 2016 17:39:00 -0000	[thread overview]
Message-ID: <CABV8kRzPpdhRsWOsU+zNEc7AcAqTqm1xdWxM0rufGAjk=yn4TA@mail.gmail.com> (raw)

The application's entry point already has the appropriate CFI to
indicate to tools that the end of the stack has been reached. This
CFI was lacking from the dynamic linker, causing garbled backtraces
after hitting _dl_start. Fix this by adding the appropriate CFI.

Example gdb output before:

```
(gdb) bt
 #0  0x00007f10a2cee2d0 in _start () from /lib64/ld-linux-x86-64.so.2
 #1  0x0000000000000003 in ?? ()
 #2  0x00007ffd2ba54ce9 in ?? ()
 #3  0x00007ffd2ba54d04 in ?? ()
 #4  0x00007ffd2ba54d07 in ?? ()
 #5  0x0000000000000000 in ?? ()
```

after:
```
(gdb) bt
 #0  0x00007f36273551b0 in _start () from
/home/kfischer/replacement-usr/lib/ld-2.23.90.so
```

This is likely applicable to other architectures as well, but I only
have access to x86_64, so this patch is limited to that architecture.
---
 sysdeps/x86_64/dl-machine.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index ed0c1a8..7a246d4 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -141,10 +141,15 @@ elf_machine_runtime_setup (struct link_map *l,
int lazy, int profile)
  .align 16\n\
 .globl _start\n\
 .globl _dl_start_user\n\
-_start:\n\
+_start:\n"\
+CFI_STARTPROC "\n"\
+CFI_UNDEFINED(%rip) "\n\
  movq %rsp, %rdi\n\
- call _dl_start\n\
-_dl_start_user:\n\
+ call _dl_start\n"\
+CFI_ENDPROC "\n\
+_dl_start_user:\n"\
+CFI_STARTPROC "\n"\
+CFI_UNDEFINED(%rip) "\n\
  # Save the user entry point address in %r12.\n\
  movq %rax, %r12\n\
  # See if we were run as a command with the executable file\n\
@@ -180,7 +185,8 @@ _dl_start_user:\n\
  # And make sure %rsp points to argc stored on the stack.\n\
  movq %r13, %rsp\n\
  # Jump to the user's entry point.\n\
- jmp *%r12\n\
+ jmp *%r12\n"\
+CFI_ENDPROC "\n\
 .previous\n\
 ");

-- 
2.6.4

             reply	other threads:[~2016-07-04 17:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-04 17:39 Keno Fischer [this message]
2016-07-04 18:23 ` Andreas Schwab
2016-07-04 18:28   ` Keno Fischer
2016-07-04 19:38     ` Andreas Schwab
2016-07-08 20:46       ` Keno Fischer
     [not found]         ` <CABV8kRwpe3k49Kk5bA-cfsF9vPj6y_1sSe_dWk8F3sTtkeDPGA@mail.gmail.com>
2016-08-02  3:27           ` Keno Fischer
2016-08-11 19:39             ` Keno Fischer
2016-11-01 20:49               ` Keno Fischer
2016-11-07 16:44                 ` H.J. Lu
2016-11-16  3:52                   ` Keno Fischer

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='CABV8kRzPpdhRsWOsU+zNEc7AcAqTqm1xdWxM0rufGAjk=yn4TA@mail.gmail.com' \
    --to=keno@juliacomputing.com \
    --cc=libc-alpha@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).