mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH v2] fix x86_64 sigreturn trampoline so gdb recognizes it
Date: Sun, 13 Nov 2016 01:12:05 +0100	[thread overview]
Message-ID: <20161113001205.GR5749@port70.net> (raw)
In-Reply-To: <20161112170712.GP5749@port70.net>

gdb can only unwind across signal handlers if it recognizes the trampoline.
on x86_64 this means the pc must be in a function called __restore_rt or
if gdb cannot determine the symbol name the instruction sequence must match
to what gdb expects.

a nop is added before __restore_rt, the __restore alias is removed and
size annotation is added to make sure gdb maps any pc value within
__restore_rt unambigously to the __restore_rt symbol name.

and the instruction sequence got fixed to match what gdb expects.
---
 arch/x86_64/ksigaction.h    | 9 +++++++++
 src/signal/x86_64/restore.s | 7 +++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 arch/x86_64/ksigaction.h

diff --git a/arch/x86_64/ksigaction.h b/arch/x86_64/ksigaction.h
new file mode 100644
index 0000000..7743c5c
--- /dev/null
+++ b/arch/x86_64/ksigaction.h
@@ -0,0 +1,9 @@
+struct k_sigaction {
+	void (*handler)(int);
+	unsigned long flags;
+	void (*restorer)(void);
+	unsigned mask[2];
+};
+
+void __restore_rt();
+#define __restore __restore_rt
diff --git a/src/signal/x86_64/restore.s b/src/signal/x86_64/restore.s
index 682af2d..b5c6e37 100644
--- a/src/signal/x86_64/restore.s
+++ b/src/signal/x86_64/restore.s
@@ -1,8 +1,7 @@
+	nop
 .global __restore_rt
-.global __restore
 .type __restore_rt,@function
-.type __restore,@function
 __restore_rt:
-__restore:
-	movl $15, %eax
+	mov $15, %rax
 	syscall
+.size __restore_rt,.-__restore_rt
-- 
2.10.2



  reply	other threads:[~2016-11-13  0:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-12 17:07 [PATCH] fix x86_64 sigreturn call " Szabolcs Nagy
2016-11-13  0:12 ` Szabolcs Nagy [this message]
2016-11-13  2:46   ` [PATCH v2] fix x86_64 sigreturn trampoline " Rich Felker

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=20161113001205.GR5749@port70.net \
    --to=nsz@port70.net \
    --cc=musl@lists.openwall.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

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 NNTP newsgroup(s).