* [PATCH] lib/lzo: fix alignment bug in lzo-rle
@ 2019-09-12 14:55 Dave Rodgman
0 siblings, 0 replies; only message in thread
From: Dave Rodgman @ 2019-09-12 14:55 UTC (permalink / raw)
To: Dave Rodgman, linux-kernel, markus, minchan, akpm; +Cc: nd
Fix an unaligned access which breaks on platforms where this is not
permitted (e.g., Sparc).
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
lib/lzo/lzo1x_compress.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c
index 4525fb094844..3ea7b93596c6 100644
--- a/lib/lzo/lzo1x_compress.c
+++ b/lib/lzo/lzo1x_compress.c
@@ -82,17 +82,19 @@ lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
ALIGN((uintptr_t)ir, 4)) &&
(ir < limit) && (*ir == 0))
ir++;
- for (; (ir + 4) <= limit; ir += 4) {
- dv = *((u32 *)ir);
- if (dv) {
+ if (IS_ALIGNED((uintptr_t)ir, 4)) {
+ for (; (ir + 4) <= limit; ir += 4) {
+ dv = *((u32 *)ir);
+ if (dv) {
# if defined(__LITTLE_ENDIAN)
- ir += __builtin_ctz(dv) >> 3;
+ ir += __builtin_ctz(dv) >> 3;
# elif defined(__BIG_ENDIAN)
- ir += __builtin_clz(dv) >> 3;
+ ir += __builtin_clz(dv) >> 3;
# else
# error "missing endian definition"
# endif
- break;
+ break;
+ }
}
}
#endif
--
2.23.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-12 14:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12 14:55 [PATCH] lib/lzo: fix alignment bug in lzo-rle Dave Rodgman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®