Fix ____longjmp_chk on x86-64.

After a recent change to fix CFI in ____longjmp_chk the test of the ss_flags used the wrong memory location.
git-mirror · Jul 31, 2009 · 66ae9e5 · 66ae9e5
1 parent 6f6f121
commit 66ae9e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S (longjmp_msg): Get
+	ss_flags from the correct location.
+
 2009-07-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/i686/Makefile (sysdep_routines): Add cacheinfo.

diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -77,7 +77,7 @@ ENTRY(____longjmp_chk)
 	leaq	24(%rsp), %rsp
 	cfi_adjust_cfa_offset(-24)
 	jne	.Lok
-	movl	8(%rsp), %eax
+	movl	-16(%rsp), %eax
 	andl	$1, %eax
 
 .Lok:
@@ -122,7 +122,7 @@ ENTRY(____longjmp_chk)
 	syscall
 	addq	$24, %rsp
 	cfi_adjust_cfa_offset(-24)
-	testl	$1, 8(%rsp)
+	testl	$1, -16(%rsp)
 	je	.Lout
 
 .Lfail:	xchgq	%r8, %rsp