* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
@ 2015-04-06 10:12 Krzysztof Kolasa
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kolasa @ 2015-04-06 10:12 UTC (permalink / raw)
To: gregkh; +Cc: tom.yeon, dsterba, linux-kernel, Krzysztof Kolasa
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 d5e7cafd69da ("LZ4 : fix the data abort issue")
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 <kkolasa@winsoft.pl>
---
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.rc1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 18:18 ` Alexander Kuleshov
@ 2015-04-03 19:01 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2015-04-03 19:01 UTC (permalink / raw)
To: Alexander Kuleshov; +Cc: Krzysztof Kolasa, dsterba, tom.yeon, linux-kernel
On Sat, Apr 04, 2015 at 12:18:07AM +0600, Alexander Kuleshov wrote:
> On 3 April 2015 at 23:36, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Fri, Apr 03, 2015 at 05:12:47PM +0200, Krzysztof Kolasa wrote:
> >> added by analogy to lz4_uncompress_unknownoutputsize(...)
> >>
> >> Signed-off-by: Krzysztof Kolasa <kkolasa@winsoft.pl>
> >> Tested-by: Alexander Kuleshov <alex0xax@gmail.com>
>
> I'm not sure that my testing was important in this case, but if you'd
> to add my name, please use another email as:
>
> Tested-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Thanks, will do so. If I ever get a patch that can be applied :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 17:36 ` Greg KH
2015-04-03 18:03 ` Krzysztof Kolasa
@ 2015-04-03 18:18 ` Alexander Kuleshov
2015-04-03 19:01 ` Greg KH
1 sibling, 1 reply; 7+ messages in thread
From: Alexander Kuleshov @ 2015-04-03 18:18 UTC (permalink / raw)
To: Greg KH; +Cc: Krzysztof Kolasa, dsterba, tom.yeon, linux-kernel
On 3 April 2015 at 23:36, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Fri, Apr 03, 2015 at 05:12:47PM +0200, Krzysztof Kolasa wrote:
>> added by analogy to lz4_uncompress_unknownoutputsize(...)
>>
>> Signed-off-by: Krzysztof Kolasa <kkolasa@winsoft.pl>
>> Tested-by: Alexander Kuleshov <alex0xax@gmail.com>
I'm not sure that my testing was important in this case, but if you'd
to add my name, please use another email as:
Tested-by: Alexander Kuleshov <kuleshovmail@gmail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 18:03 ` Krzysztof Kolasa
@ 2015-04-03 18:06 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2015-04-03 18:06 UTC (permalink / raw)
To: Krzysztof Kolasa; +Cc: Alexander Kuleshov, dsterba, tom.yeon, linux-kernel
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 <kkolasa@winsoft.pl>
> ---
> 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 :(
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 17:36 ` Greg KH
@ 2015-04-03 18:03 ` Krzysztof Kolasa
2015-04-03 18:06 ` Greg KH
2015-04-03 18:18 ` Alexander Kuleshov
1 sibling, 1 reply; 7+ messages in thread
From: Krzysztof Kolasa @ 2015-04-03 18:03 UTC (permalink / raw)
To: Greg KH; +Cc: Alexander Kuleshov, dsterba, tom.yeon, linux-kernel
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 <kkolasa@winsoft.pl>
---
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 15:12 ` [PATCHv2] " Krzysztof Kolasa
@ 2015-04-03 17:36 ` Greg KH
2015-04-03 18:03 ` Krzysztof Kolasa
2015-04-03 18:18 ` Alexander Kuleshov
0 siblings, 2 replies; 7+ messages in thread
From: Greg KH @ 2015-04-03 17:36 UTC (permalink / raw)
To: Krzysztof Kolasa; +Cc: Alexander Kuleshov, dsterba, tom.yeon, linux-kernel
On Fri, Apr 03, 2015 at 05:12:47PM +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 <kkolasa@winsoft.pl>
> Tested-by: Alexander Kuleshov <alex0xax@gmail.com>
> ---
> 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++;
All whitespace is messed up, and this patch can not be applied :(
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4
2015-04-03 14:44 ` Greg KH
@ 2015-04-03 15:12 ` Krzysztof Kolasa
2015-04-03 17:36 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Kolasa @ 2015-04-03 15:12 UTC (permalink / raw)
To: Greg KH; +Cc: Alexander Kuleshov, dsterba, tom.yeon, linux-kernel
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 <kkolasa@winsoft.pl>
---
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-04-06 10:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-06 10:12 [PATCHv2] lz4: fix system halted at boot kernel x86_64 compressed lz4 Krzysztof Kolasa
[not found] <55114A1D.7030508@winsoft.pl>
2015-03-25 0:44 ` David Sterba
2015-03-25 7:04 ` Krzysztof Kolasa
2015-03-31 15:22 ` Greg KH
2015-04-03 11:33 ` Krzysztof Kolasa
2015-04-03 13:17 ` Greg KH
2015-04-03 13:58 ` Krzysztof Kolasa
2015-04-03 14:17 ` Alexander Kuleshov
2015-04-03 14:23 ` Greg KH
2015-04-03 14:30 ` Krzysztof Kolasa
2015-04-03 14:44 ` Greg KH
2015-04-03 15:12 ` [PATCHv2] " Krzysztof Kolasa
2015-04-03 17:36 ` Greg KH
2015-04-03 18:03 ` Krzysztof Kolasa
2015-04-03 18:06 ` Greg KH
2015-04-03 18:18 ` Alexander Kuleshov
2015-04-03 19:01 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®