Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752315AbbDCSDk (ORCPT ); Fri, 3 Apr 2015 14:03:40 -0400 Received: from vps01.winsoft.pl ([5.133.9.51]:39799 "EHLO vps01.winsoft.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751335AbbDCSDj (ORCPT ); Fri, 3 Apr 2015 14:03:39 -0400 Subject: Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4 To: Greg KH references: <55125E1B.3090506@winsoft.pl> <20150331152245.GB11455@kroah.com> <551E7AA2.1050206@winsoft.pl> <20150403131731.GA28380@kroah.com> <551E9C70.4020508@winsoft.pl> <20150403142341.GA13463@kroah.com> <551EA410.9070603@winsoft.pl> <20150403144427.GA31547@kroah.com> <551EADEF.2060508@winsoft.pl> <20150403173615.GA11233@kroah.com> Cc: Alexander Kuleshov , dsterba@suse.cz, tom.yeon@windriver.com, linux-kernel@vger.kernel.org From: Krzysztof Kolasa organization: P.H.U. "WINSOFT" Krzysztof Kolasa message-id: <551ED5F5.7050700@winsoft.pl> Date: Fri, 3 Apr 2015 20:03:33 +0200 user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0a1 mime-version: 1.0 in-reply-to: <20150403173615.GA11233@kroah.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2087 Lines: 61 Decompression process ends with an error when loading 64bit lz4 kernel: Decoding failed -- System halted This condition is not needed for 64bit kernel( from the last commit d5e7caf ) if( ... || (op + COPYLENGTH) > oend) goto _output_error macro LZ4_SECURE_COPY() tests op and does not copy any data when op exceeds the value, decompression process is continued. added by analogy to lz4_uncompress_unknownoutputsize(...) Signed-off-by: Krzysztof Kolasa --- lib/lz4/lz4_decompress.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c index f0f5c5c..8a742b1 100644 --- a/lib/lz4/lz4_decompress.c +++ b/lib/lz4/lz4_decompress.c @@ -139,8 +139,12 @@ static int lz4_uncompress(const char *source, char *dest, int osize) /* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; +#if LZ4_ARCH64 + if ((ref + COPYLENGTH) > oend) +#else if ((ref + COPYLENGTH) > oend || (op + COPYLENGTH) > oend) +#endif goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) @@ -270,7 +274,13 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest, if (cpy > oend - COPYLENGTH) { if (cpy > oend) goto _output_error; /* write outside of buf */ - +#if LZ4_ARCH64 + if ((ref + COPYLENGTH) > oend) +#else + if ((ref + COPYLENGTH) > oend || + (op + COPYLENGTH) > oend) +#endif + goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) *op++ = *ref++; -- 2.4.0.rc0.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/