Fix ____longjmp_chk for s390/s390x.

(cherry picked from commit e3b7670be21d6992e3ca9ee1ad3a5d08eb3a24c9)

diff --git a/ChangeLog b/ChangeLog
index ba93d2f6a54fb0941befe387be125ce945f353b8..44deae5d19bb560c7b9868cf01e2322cd3a7cad8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Andreas Schwab  <schwab@redhat.com>
+
+       * 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  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #11194]

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
index b28e58749848a72395839fbe2741efd4233acbac..f2c1518572ff2b1d400484ecb72345c5e6297686 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
@@ -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");\
            }                                                           \
        }                                                               \

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
index dcf58fb50baa7af26058777a51150413e5854071..261be250dcc564628c36b550325a848b4d53f24a 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
@@ -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");\
            }                                                           \
        }                                                               \