From 69ea6405980f217557b6a58f70ff60d8d88519a5 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 28 May 2012 12:59:56 +1000 Subject: [PATCH] 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 Acked-by: David S. Miller Signed-off-by: Linus Torvalds --- lib/strnlen_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c index 90900ecfeb5..a28df5206d9 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 /*