Fix typing of the bit twiddling done in _dl_setup_stack_chk_guard.
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 Mar 2012 02:41:43 +0000 (19:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Mar 2012 02:41:43 +0000 (19:41 -0700)
* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):
Fix masking out of the most significant byte of random value used.

ChangeLog
sysdeps/unix/sysv/linux/dl-osinfo.h

index 85993dc..29b7c67 100644 (file)
--- 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>
index 780b20a..1ff8a2f 100644 (file)
@@ -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