summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2012-05-28 12:59:56 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-27 20:59:46 -0700
commit69ea6405980f217557b6a58f70ff60d8d88519a5 (patch)
treed5e2b702e0226465d6962a28d1406c2deeb9fedd
parent1e2aec873ad6d16538512dbb96853caa1fa076af (diff)
downloadlinux-69ea6405980f217557b6a58f70ff60d8d88519a5.tar.bz2
lib: Fix generic strnlen_user for 32-bit big-endian machines
The aligned_byte_mask() definition is wrong for 32-bit big-endian machines: the "7-(n)" part of the definition assumes a long is 8 bytes. This fixes it by using BITS_PER_LONG - 8 instead of 8*7. Tested on 32-bit and 64-bit PowerPC. Signed-off-by: Paul Mackerras <paulus@samba.org> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/strnlen_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
index 90900ecfeb54..a28df5206d95 100644
--- a/lib/strnlen_user.c
+++ b/lib/strnlen_user.c
@@ -8,7 +8,7 @@
#ifdef __LITTLE_ENDIAN
# define aligned_byte_mask(n) ((1ul << 8*(n))-1)
#else
-# define aligned_byte_mask(n) (~0xfful << 8*(7-(n)))
+# define aligned_byte_mask(n) (~0xfful << (BITS_PER_LONG - 8 - 8*(n)))
#endif
/*