summaryrefslogtreecommitdiffstats
path: root/lib/decompress_unlz4.c
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2014-01-23 15:56:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 16:37:04 -0800
commit2a1d689c9ba42a6066540fb221b6ecbd6298b728 (patch)
tree55c0cab9c0aa7d17fc23f03b9b7631e24458c125 /lib/decompress_unlz4.c
parent40e2c71d57565a82970a5a2b75f7eb67bb3252f4 (diff)
downloadlinux-stable-2a1d689c9ba42a6066540fb221b6ecbd6298b728.tar.gz
linux-stable-2a1d689c9ba42a6066540fb221b6ecbd6298b728.tar.bz2
linux-stable-2a1d689c9ba42a6066540fb221b6ecbd6298b728.zip
lib/decompress_unlz4.c: always set an error return code on failures
"ret", being set to -1 early on, gets cleared by the first invocation of lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence subsequent failures wouldn't be noticed by the caller without setting it back to -1 right after those calls. Reported-by: Matthew Daley <mattjd@gmail.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: Kyungsik Lee <kyungsik.lee@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/decompress_unlz4.c')
-rw-r--r--lib/decompress_unlz4.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c
index 3e67cfad16ad..7d1e83caf8ad 100644
--- a/lib/decompress_unlz4.c
+++ b/lib/decompress_unlz4.c
@@ -141,6 +141,7 @@ STATIC inline int INIT unlz4(u8 *input, int in_len,
goto exit_2;
}
+ ret = -1;
if (flush && flush(outp, dest_len) != dest_len)
goto exit_2;
if (output)