leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/lzo/lzo1x_compress.c: fix alignment bug in lzo-rle

Browse Source 
Fix an unaligned access which breaks on platforms where this is not
permitted (e.g., Sparc).

Link: http://lkml.kernel.org/r/20190912145502.35229-1-dave.rodgman@arm.com
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
Cc: Dave Rodgman <dave.rodgman@arm.com>
Cc: Markus F.X.J. Oberhumer <markus@oberhumer.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dave Rodgman 2019-09-25 16:48:24 -07:00 committed by Linus Torvalds
parent 984035ad7b
commit 09b35b4192
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/lzo/lzo1x_compress.c
View File

@ -83,17 +83,19 @@ next:
ALIGN((uintptr_t)ir, 4)) && ALIGN((uintptr_t)ir, 4)) &&
(ir < limit) && (*ir == 0)) (ir < limit) && (*ir == 0))
ir++; ir++;
for (; (ir + 4) <= limit; ir += 4) { if (IS_ALIGNED((uintptr_t)ir, 4)) {
dv = *((u32 *)ir); for (; (ir + 4) <= limit; ir += 4) {
if (dv) { dv = *((u32 *)ir);
if (dv) {
# if defined(__LITTLE_ENDIAN) # if defined(__LITTLE_ENDIAN)
ir += __builtin_ctz(dv) >> 3; ir += __builtin_ctz(dv) >> 3;
# elif defined(__BIG_ENDIAN) # elif defined(__BIG_ENDIAN)
ir += __builtin_clz(dv) >> 3; ir += __builtin_clz(dv) >> 3;
# else # else
# error "missing endian definition" # error "missing endian definition"
# endif # endif
break; break;
}
} }
} }
#endif #endif