| Message ID | 20120528025956.GA6822@bloggs.ozlabs.ibm.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Paul Mackerras |
| Headers | show |
From: Paul Mackerras <paulus@samba.org> Date: Mon, 28 May 2012 12:59:56 +1000 > 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>
diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c index 90900ec..a28df52 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 /*
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> --- lib/strnlen_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)