GNU C Library master sources branch, master, updated. glibc-2.15-290-g6c6a98c

[aj@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6c6a98c983c44b440ae66d2aa8f32529a9dd7bfe (commit)
      from  21bb2d2e642a5376983868a51743cfa0d12df6b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6c6a98c983c44b440ae66d2aa8f32529a9dd7bfe

commit 6c6a98c983c44b440ae66d2aa8f32529a9dd7bfe
Author: Tom de Vries <tom@codesourcery.com>
Date:   Mon Mar 5 11:05:42 2012 +0100

    2012-03-05  Tom de Vries  <tom@codesourcery.com>
    
    	* sysdeps/generic/dl-osinfo.h (_dl_setup_stack_chk_guard): Ensure
    	default stack guard is set in last bytes.
    	* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Same.

diff --git a/ChangeLog b/ChangeLog
index 5429f3b..7c45b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-05  Tom de Vries  <tom@codesourcery.com>
+
+	* sysdeps/generic/dl-osinfo.h (_dl_setup_stack_chk_guard): Ensure
+	default stack guard is set in last bytes.
+	* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Same.
+
 2012-03-05  Kees Cook  <keescook@chromium.org>
 
 	* stdio-common/vfprintf.c (vfprintf): add missing errno settings.
diff --git a/sysdeps/generic/dl-osinfo.h b/sysdeps/generic/dl-osinfo.h
index 2eaab3b..548fc46 100644
--- a/sysdeps/generic/dl-osinfo.h
+++ b/sysdeps/generic/dl-osinfo.h
@@ -30,8 +30,8 @@ _dl_setup_stack_chk_guard (void *dl_random)
 
   if (dl_random == NULL)
     {
-      ret.bytes[sizeof (ret) - 2] = 255;
-      ret.bytes[sizeof (ret) - 3] = '\n';
+      ret.bytes[sizeof (ret) - 1] = 255;
+      ret.bytes[sizeof (ret) - 2] = '\n';
     }
   else
     {
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index 874660b..780b20a 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -84,8 +84,8 @@ _dl_setup_stack_chk_guard (void *dl_random)
 	    return ret.num;
 	}
 # endif
-      ret.bytes[filllen - 2] = 255;
-      ret.bytes[filllen - 3] = '\n';
+      ret.bytes[filllen] = 255;
+      ret.bytes[filllen - 1] = '\n';
     }
   else
 #endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                           |    6 ++++++
 sysdeps/generic/dl-osinfo.h         |    4 ++--
 sysdeps/unix/sysv/linux/dl-osinfo.h |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources