Skip to contentSkip to conversation

lib/lzo: fix alignment bug in lzo-rle

PATCH Applied Dave Rodgman 1 participant 1 message Sep 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/lzo: fix alignment bug in lzo-rle

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

---
 lib/lzo/lzo1x_compress.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
lib/lzo/lzo1x_compress.c +8 -6
index 4525fb094844..3ea7b93596c6 100644
@@ -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
Signature · 1 line
2.23.0