This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-357-gcb9d617
- From: davem at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Mar 2012 02:47:49 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-357-gcb9d617
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 cb9d617437084b4ebf02e50c0a82c5dd2582029a (commit)
from 6e226b094f4d9fb00797f93d89773dc12811fd0f (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=cb9d617437084b4ebf02e50c0a82c5dd2582029a
commit cb9d617437084b4ebf02e50c0a82c5dd2582029a
Author: David S. Miller <davem@davemloft.net>
Date: Sun Mar 11 19:41:43 2012 -0700
Fix typing of the bit twiddling done in _dl_setup_stack_chk_guard.
* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):
Fix masking out of the most significant byte of random value used.
diff --git a/ChangeLog b/ChangeLog
index 85993dc..29b7c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-03-11 David S. Miller <davem@davemloft.net>
+ * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):
+ Fix masking out of the most significant byte of random value used.
+
* sysdeps/sparc/fpu/libm-test-ulps: Update.
2012-03-10 Andreas Schwab <schwab@linux-m68k.org>
diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index 780b20a..1ff8a2f 100644
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -95,9 +95,9 @@ _dl_setup_stack_chk_guard (void *dl_random)
directly and not use the kernel-provided data to seed a PRNG. */
memcpy (ret.bytes, dl_random, sizeof (ret));
#if BYTE_ORDER == LITTLE_ENDIAN
- ret.num &= ~0xff;
+ ret.num &= ~(uintptr_t)0xff;
#elif BYTE_ORDER == BIG_ENDIAN
- ret.num &= ~(0xff << (8 * (sizeof (ret) - 1)));
+ ret.num &= ~((uintptr_t)0xff << (8 * (sizeof (ret) - 1)));
#else
# error "BYTE_ORDER unknown"
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
sysdeps/unix/sysv/linux/dl-osinfo.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources