[commits] r9701 - in /fsf/trunk/libc: ./ sysdeps/unix/sysv/linux/s390/s390-32/ sysdeps/unix/sysv/linux/s390/s390-64/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jan 21 00:03:04 2010
New Revision: 9701

Log:
Import glibc-mainline for 2010-01-21

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Jan 21 00:03:04 2010
@@ -1,3 +1,10 @@
+2010-01-20  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+	(CHECK_SP): Fix check for alternate stack.
+	* sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+	(CHECK_SP): Likewise.
+
 2010-01-19  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	* sysdeps/i386/i686/multiarch/memmove.S: Also check

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c Thu Jan 21 00:03:04 2010
@@ -46,7 +46,7 @@
 	    {								\
 	      if ((oss.ss_flags & SS_ONSTACK) == 0			\
 		  || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp	\
-		      >= oss.ss_size))					\
+		      < oss.ss_size))					\
 		__fortify_fail ("longjmp causes uninitialized stack frame");\
 	    }								\
 	}								\

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c Thu Jan 21 00:03:04 2010
@@ -46,7 +46,7 @@
 	    {								\
 	      if ((oss.ss_flags & SS_ONSTACK) == 0			\
 		  || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp	\
-		      >= oss.ss_size))					\
+		      < oss.ss_size))					\
 		__fortify_fail ("longjmp causes uninitialized stack frame");\
 	    }								\
 	}								\