lz4: Update to version 1.9.4

Signed-off-by: Andrzej Perczak <linux@andrzejperczak.com>
Signed-off-by: Cyber Knight <cyberknight755@gmail.com>

Author: xNombre

include/linux/lz4.h

@@ -58,9 +58,9 @@
 #define LZ4_MEMORY_USAGE 14
 
 #define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */
-#define LZ4_COMPRESSBOUND(isize)                                               \
-	((unsigned int)(isize) > (unsigned int)LZ4_MAX_INPUT_SIZE ?            \
-		 0 :                                                           \
+#define LZ4_COMPRESSBOUND(isize)                                    \
+	((unsigned int)(isize) > (unsigned int)LZ4_MAX_INPUT_SIZE ? \
+		 0 :                                                \
 		 (isize) + ((isize) / 255) + 16)
 
 #define LZ4_ACCELERATION_DEFAULT 1
@@ -83,32 +83,33 @@
 /*-************************************************************************
  *	STREAMING CONSTANTS AND STRUCTURES
  **************************************************************************/
-#define LZ4_STREAMSIZE                                                         \
-	((1UL << LZ4_MEMORY_USAGE) +                                           \
+#define LZ4_STREAM_MINSIZE           \
+	((1UL << LZ4_MEMORY_USAGE) + \
 	 32) /* static size, for inter-version compatibility */
-#define LZ4_STREAMSIZE_VOIDP (LZ4_STREAMSIZE / sizeof(void *))
-
-#define LZ4_STREAMDECODESIZE_U64                                               \
-	(4 + ((sizeof(void *) == 16) ? 2 : 0) /*AS-400*/)
-#define LZ4_STREAMDECODESIZE                                                   \
-	(LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
 
 #define LZ4_STREAMHCSIZE_SIZET (262192 / sizeof(size_t))
 
+/*! LZ4_stream_t :
+ *  Never ever use below internal definitions directly !
+ *  These definitions are not API/ABI safe, and may change in future versions.
+ *  If you need static allocation, declare or allocate an LZ4_stream_t object.
+**/
+
 /*
  * LZ4_stream_t - information structure to track an LZ4 stream.
  */
 typedef struct LZ4_stream_t_internal LZ4_stream_t_internal;
 struct LZ4_stream_t_internal {
 	uint32_t hashTable[LZ4_HASH_SIZE_U32];
-	uint32_t currentOffset;
-	uint32_t tableType;
 	const uint8_t *dictionary;
 	const LZ4_stream_t_internal *dictCtx;
+	uint32_t currentOffset;
+	uint32_t tableType;
 	uint32_t dictSize;
+	/* Implicit padding to ensure structure is aligned */
 };
 typedef union {
-	void *table[LZ4_STREAMSIZE_VOIDP];
+	char minStateSize[LZ4_STREAM_MINSIZE];
 	LZ4_stream_t_internal internal_donotuse;
 } LZ4_stream_t;
 
@@ -143,21 +144,27 @@ typedef union {
  *
  * init this structure using LZ4_setStreamDecode (or memset()) before first use
  */
+/*! LZ4_streamDecode_t :
+ *  Never ever use below internal definitions directly !
+ *  These definitions are not API/ABI safe, and may change in future versions.
+ *  If you need static allocation, declare or allocate an LZ4_streamDecode_t object.
+**/
 typedef struct {
 	const uint8_t *externalDict;
-	size_t extDictSize;
 	const uint8_t *prefixEnd;
+	size_t extDictSize;
 	size_t prefixSize;
 } LZ4_streamDecode_t_internal;
+#define LZ4_STREAMDECODE_MINSIZE 32
 typedef union {
-	unsigned long long table[LZ4_STREAMDECODESIZE_U64];
+	char minStateSize[LZ4_STREAMDECODE_MINSIZE];
 	LZ4_streamDecode_t_internal internal_donotuse;
 } LZ4_streamDecode_t;
 
 /*-************************************************************************
  *	SIZE OF STATE
  **************************************************************************/
-#define LZ4_MEM_COMPRESS LZ4_STREAMSIZE
+#define LZ4_MEM_COMPRESS sizeof(LZ4_stream_t)
 #define LZ4HC_MEM_COMPRESS LZ4_STREAMHCSIZE
 
 /*-************************************************************************

lib/lz4/lz4_compress.c

@@ -1068,7 +1068,8 @@ int LZ4_saveDict(LZ4_stream_t *LZ4_dict, char *safeBuffer, int dictSize)
 		const BYTE *const previousDictEnd =
 			dict->dictionary + dict->dictSize;
 		assert(dict->dictionary);
-		LZ4_memmove(safeBuffer, previousDictEnd - dictSize, dictSize);
+		LZ4_memmove(safeBuffer, previousDictEnd - dictSize,
+			    (size_t)dictSize);
 	}
 
 	dict->dictionary = (const BYTE *)safeBuffer;