diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-22 17:44:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-22 17:44:18 +0000 |
| commit | c67da0b50e3d20f89d7bb352cd67dcf66d808e50 (patch) | |
| tree | 7231edceca2789279c33fc16e86748dce81a1092 | |
| parent | 0efe424f4f6154ff0c33a87cc05ff59ded6a8521 (diff) | |
| download | glibc-c67da0b50e3d20f89d7bb352cd67dcf66d808e50.tar.gz glibc-c67da0b50e3d20f89d7bb352cd67dcf66d808e50.tar.xz glibc-c67da0b50e3d20f89d7bb352cd67dcf66d808e50.zip | |
Also protect SP and BP.
| -rw-r--r-- | sysdeps/x86_64/__longjmp.S | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/setjmp.S | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S index becfb4f79d..dd797e8a7b 100644 --- a/sysdeps/x86_64/__longjmp.S +++ b/sysdeps/x86_64/__longjmp.S @@ -51,6 +51,8 @@ ENTRY(__longjmp) movq (JB_PC*8)(%rdi),%rdx movq (JB_RSP*8)(%rdi),%rsp #ifdef PTR_DEMANGLE + PTR_DEMANGLE (%rbp) + PTR_DEMANGLE (%rsp) PTR_DEMANGLE (%rdx) #endif jmpq *%rdx diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S index 8af5502042..39c78c9981 100644 --- a/sysdeps/x86_64/setjmp.S +++ b/sysdeps/x86_64/setjmp.S @@ -26,12 +26,21 @@ ENTRY (__sigsetjmp) /* Save registers. */ movq %rbx, (JB_RBX*8)(%rdi) +#ifdef PTR_MANGLE + movq %rbp, %rax + PTR_MANGLE (%rax) + movq %rax, (JB_RBP*8)(%rdi) +#else movq %rbp, (JB_RBP*8)(%rdi) +#endif movq %r12, (JB_R12*8)(%rdi) movq %r13, (JB_R13*8)(%rdi) movq %r14, (JB_R14*8)(%rdi) movq %r15, (JB_R15*8)(%rdi) leaq 8(%rsp), %rdx /* Save SP as it will be after we return. */ +#ifdef PTR_MANGLE + PTR_MANGLE (%rdx) +#endif movq %rdx, (JB_RSP*8)(%rdi) movq (%rsp), %rax /* Save PC we are returning to now. */ #ifdef PTR_MANGLE |