Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbbDCSGS (ORCPT ); Fri, 3 Apr 2015 14:06:18 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45465 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463AbbDCSGP (ORCPT ); Fri, 3 Apr 2015 14:06:15 -0400 Date: Fri, 3 Apr 2015 20:06:11 +0200 From: Greg KH To: Krzysztof Kolasa Cc: Alexander Kuleshov , dsterba@suse.cz, tom.yeon@windriver.com, linux-kernel@vger.kernel.org Subject: Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4 Message-ID: <20150403180611.GA12280@kroah.com> References: <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> <551ED5F5.7050700@winsoft.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <551ED5F5.7050700@winsoft.pl> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2298 Lines: 63 On Fri, Apr 03, 2015 at 08:03:33PM +0200, Krzysztof Kolasa wrote: > 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 Still all tabs turned to spaces :( -- 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/