8 files changed, 488 insertions, 434 deletions

diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index b5721e0b979c..3db1b7591559 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -25084,38 +25084,40 @@ static struct pcomp_testvec zlib_decomp_tv_template[] = {
 static struct comp_testvec lzo_comp_tv_template[] = {
         {
                 .inlen  = 70,
-                .outlen = 46,
+                .outlen = 57,
                 .input  = "Join us now and share the software "
                         "Join us now and share the software ",
                 .output = "\x00\x0d\x4a\x6f\x69\x6e\x20\x75"
-                        "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                        "\x64\x20\x73\x68\x61\x72\x65\x20"
-                        "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                        "\x77\x70\x01\x01\x4a\x6f\x69\x6e"
-                        "\x3d\x88\x00\x11\x00\x00",
+                          "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
+                          "\x64\x20\x73\x68\x61\x72\x65\x20"
+                          "\x74\x68\x65\x20\x73\x6f\x66\x74"
+                          "\x77\x70\x01\x32\x88\x00\x0c\x65"
+                          "\x20\x74\x68\x65\x20\x73\x6f\x66"
+                          "\x74\x77\x61\x72\x65\x20\x11\x00"
+                          "\x00",
         }, {
                 .inlen  = 159,
-                .outlen = 133,
+                .outlen = 131,
                 .input  = "This document describes a compression method based on the LZO "
                         "compression algorithm.  This document defines the application of "
                         "the LZO algorithm used in UBIFS.",
-                .output = "\x00\x2b\x54\x68\x69\x73\x20\x64"
+                .output = "\x00\x2c\x54\x68\x69\x73\x20\x64"
                           "\x6f\x63\x75\x6d\x65\x6e\x74\x20"
                           "\x64\x65\x73\x63\x72\x69\x62\x65"
                           "\x73\x20\x61\x20\x63\x6f\x6d\x70"
                           "\x72\x65\x73\x73\x69\x6f\x6e\x20"
                           "\x6d\x65\x74\x68\x6f\x64\x20\x62"
                           "\x61\x73\x65\x64\x20\x6f\x6e\x20"
-                          "\x74\x68\x65\x20\x4c\x5a\x4f\x2b"
-                          "\x8c\x00\x0d\x61\x6c\x67\x6f\x72"
-                          "\x69\x74\x68\x6d\x2e\x20\x20\x54"
-                          "\x68\x69\x73\x2a\x54\x01\x02\x66"
-                          "\x69\x6e\x65\x73\x94\x06\x05\x61"
-                          "\x70\x70\x6c\x69\x63\x61\x74\x76"
-                          "\x0a\x6f\x66\x88\x02\x60\x09\x27"
-                          "\xf0\x00\x0c\x20\x75\x73\x65\x64"
-                          "\x20\x69\x6e\x20\x55\x42\x49\x46"
-                          "\x53\x2e\x11\x00\x00",
+                          "\x74\x68\x65\x20\x4c\x5a\x4f\x20"
+                          "\x2a\x8c\x00\x09\x61\x6c\x67\x6f"
+                          "\x72\x69\x74\x68\x6d\x2e\x20\x20"
+                          "\x2e\x54\x01\x03\x66\x69\x6e\x65"
+                          "\x73\x20\x74\x06\x05\x61\x70\x70"
+                          "\x6c\x69\x63\x61\x74\x76\x0a\x6f"
+                          "\x66\x88\x02\x60\x09\x27\xf0\x00"
+                          "\x0c\x20\x75\x73\x65\x64\x20\x69"
+                          "\x6e\x20\x55\x42\x49\x46\x53\x2e"
+                          "\x11\x00\x00",
         },
 };
 
diff --git a/include/linux/lzo.h b/include/linux/lzo.h
index d793497ec1ca..a0848d9377e5 100644
--- a/include/linux/lzo.h
+++ b/include/linux/lzo.h
@@ -4,28 +4,28 @@
  *  LZO Public Kernel Interface
  *  A mini subset of the LZO real-time data compression library
  *
- *  Copyright (C) 1996-2005 Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ *  Copyright (C) 1996-2012 Markus F.X.J. Oberhumer <markus@oberhumer.com>
  *
  *  The full LZO package can be found at:
  *  http://www.oberhumer.com/opensource/lzo/
  *
- *  Changed for kernel use by:
+ *  Changed for Linux kernel use by:
  *  Nitin Gupta <nitingupta910@gmail.com>
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
-#define LZO1X_MEM_COMPRESS      (16384 * sizeof(unsigned char *))
-#define LZO1X_1_MEM_COMPRESS    LZO1X_MEM_COMPRESS
+#define LZO1X_1_MEM_COMPRESS    (8192 * sizeof(unsigned short))
+#define LZO1X_MEM_COMPRESS      LZO1X_1_MEM_COMPRESS
 
 #define lzo1x_worst_compress(x) ((x) + ((x) / 16) + 64 + 3)
 
-/* This requires 'workmem' of size LZO1X_1_MEM_COMPRESS */
+/* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */
 int lzo1x_1_compress(const unsigned char *src, size_t src_len,
-                        unsigned char *dst, size_t *dst_len, void *wrkmem);
+                     unsigned char *dst, size_t *dst_len, void *wrkmem);
 
 /* safe decompression with overrun testing */
 int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
-                        unsigned char *dst, size_t *dst_len);
+                          unsigned char *dst, size_t *dst_len);
 
 /*
  * Return values (< 0 = Error)
@@ -40,5 +40,6 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
 #define LZO_E_EOF_NOT_FOUND             (-7)
 #define LZO_E_INPUT_NOT_CONSUMED        (-8)
 #define LZO_E_NOT_YET_IMPLEMENTED       (-9)
+#define LZO_E_INVALID_ARGUMENT          (-10)
 
 #endif
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
index 4531294fa62f..960183d4258f 100644
--- a/lib/decompress_unlzo.c
+++ b/lib/decompress_unlzo.c
@@ -31,7 +31,7 @@
  */
 
 #ifdef STATIC
-#include "lzo/lzo1x_decompress.c"
+#include "lzo/lzo1x_decompress_safe.c"
 #else
 #include <linux/decompress/unlzo.h>
 #endif
diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile
index e764116ea12d..f0f7d7ca2b83 100644
--- a/lib/lzo/Makefile
+++ b/lib/lzo/Makefile
@@ -1,5 +1,5 @@
 lzo_compress-objs := lzo1x_compress.o
-lzo_decompress-objs := lzo1x_decompress.o
+lzo_decompress-objs := lzo1x_decompress_safe.o
 
 obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o
 obj-$(CONFIG_LZO_DECOMPRESS) += lzo_decompress.o
diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c
index a6040990a62e..236eb21167b5 100644
--- a/lib/lzo/lzo1x_compress.c
+++ b/lib/lzo/lzo1x_compress.c
@@ -1,194 +1,243 @@
 /*
- *  LZO1X Compressor from MiniLZO
+ *  LZO1X Compressor from LZO
  *
- *  Copyright (C) 1996-2005 Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ *  Copyright (C) 1996-2012 Markus F.X.J. Oberhumer <markus@oberhumer.com>
  *
  *  The full LZO package can be found at:
  *  http://www.oberhumer.com/opensource/lzo/
  *
- *  Changed for kernel use by:
+ *  Changed for Linux kernel use by:
  *  Nitin Gupta <nitingupta910@gmail.com>
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/lzo.h>
 #include <asm/unaligned.h>
+#include <linux/lzo.h>
 #include "lzodefs.h"
 
 static noinline size_t
-_lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
-                unsigned char *out, size_t *out_len, void *wrkmem)
+lzo1x_1_do_compress(const unsigned char *in, size_t in_len,
+                    unsigned char *out, size_t *out_len,
+                    size_t ti, void *wrkmem)
 {
+        const unsigned char *ip;
+        unsigned char *op;
         const unsigned char * const in_end = in + in_len;