diff options
| author | Dave Rodgman <dave.rodgman@arm.com> | 2019-09-25 18:16:11 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-25 18:16:11 -0700 |
| commit | 11be7ee0742e029a2595c7576094a6bbd25f182e (patch) | |
| tree | a5b43a77251e072db71073a2b5c7c9956eb7667a | |
| parent | 68ed28087d048b0ea4d510397e37c537562b5f2c (diff) | |
| download | net-11be7ee0742e029a2595c7576094a6bbd25f182e.tar.gz | |
lib/lzo/lzo1x_compress.c: fix alignment bug in lzo-rle
Notice: this object is not reachable from any branch.
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: Mark Brown <broonie@kernel.org>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | lib/lzo/lzo1x_compress.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c index ba16c08e8cb921..717c940112f9d7 100644 --- a/lib/lzo/lzo1x_compress.c +++ b/lib/lzo/lzo1x_compress.c @@ -83,17 +83,19 @@ next: 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 |