From 1b0bfc6946b460bcebe9db19a015f2cac711f7f5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 13 Aug 2017 21:10:44 +0200 Subject: __fortify_fail: Remove internal_function attribute __fortify_fail is called across DSO boundaries, so it should not use a non-standard calling convention. --- sysdeps/mach/hurd/i386/____longjmp_chk.S | 2 ++ sysdeps/unix/sysv/linux/i386/____longjmp_chk.S | 2 ++ 2 files changed, 4 insertions(+) (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/i386/____longjmp_chk.S b/sysdeps/mach/hurd/i386/____longjmp_chk.S index ac28c94e13..e7c988254f 100644 --- a/sysdeps/mach/hurd/i386/____longjmp_chk.S +++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S @@ -36,9 +36,11 @@ longjmp_msg: cfi_register(%ebx,%ecx); \ LOAD_PIC_REG (bx); \ leal longjmp_msg@GOTOFF(%ebx), %eax; \ + movl %eax, (%esp); \ call HIDDEN_JUMPTARGET(__fortify_fail) #else # define CALL_FAIL movl $longjmp_msg, %eax; \ + movl %eax, (%esp); \ call HIDDEN_JUMPTARGET(__fortify_fail) #endif diff --git a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S index d46ea84e30..2e4427abc8 100644 --- a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -33,9 +33,11 @@ longjmp_msg: cfi_register(%ebx,%ecx); \ LOAD_PIC_REG (bx); \ leal longjmp_msg@GOTOFF(%ebx), %eax; \ + movl %eax, (%esp); \ call HIDDEN_JUMPTARGET(__fortify_fail) #else # define CALL_FAIL movl $longjmp_msg, %eax; \ + movl %eax, (%esp); \ call HIDDEN_JUMPTARGET(__fortify_fail) #endif -- cgit 1.4.1