Commit ed38ff16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux 

Pull zstd fixes from Nick Terrell:
 "A small number of fixes for zstd-v1.5.2.

  I'm not pulling in zstd-v1.5.4 from upstream this release because it
  didn't have any time to bake in linux-next, but I'm aiming for the
  next update in v6.4"

* tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux:
  zstd: Fix definition of assert()
  lib: zstd: Backport fix for in-place decompression
  lib: zstd: Fix -Wstringop-overflow warning
parents c0856b7c 6906598f

lib/zstd/common/zstd_deps.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) { 


#include <linux/kernel.h>



#define assert(x) WARN_ON((x))

#define assert(x) WARN_ON(!(x))



#endif /* ZSTD_DEPS_ASSERT */

#endif /* ZSTD_DEPS_NEED_ASSERT */

lib/zstd/decompress/huf_decompress.c

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static void HUF_fillDTableX2Level2(HUF_DEltX2* DTable, U32 targetLog, const U32 


static void HUF_fillDTableX2(HUF_DEltX2* DTable, const U32 targetLog,

                           const sortedSymbol_t* sortedList,

                           const U32* rankStart, rankVal_t rankValOrigin, const U32 maxWeight,

                           const U32* rankStart, rankValCol_t *rankValOrigin, const U32 maxWeight,

                           const U32 nbBitsBaseline)

{

    U32* const rankVal = rankValOrigin[0];

lib/zstd/decompress/zstd_decompress.c

+22 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static size_t ZSTD_copyRawBlock(void* dst, size_t dstCapacity, 
        if (srcSize == 0) return 0;

        RETURN_ERROR(dstBuffer_null, "");

    }

    ZSTD_memcpy(dst, src, srcSize);

    ZSTD_memmove(dst, src, srcSize);

    return srcSize;

}
@@ -858,6 +858,7 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx, 


    /* Loop on each block */

    while (1) {

        BYTE* oBlockEnd = oend;

        size_t decodedSize;

        blockProperties_t blockProperties;

        size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties);
@@ -867,16 +868,34 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx, 
        remainingSrcSize -= ZSTD_blockHeaderSize;

        RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong, "");



        if (ip >= op && ip < oBlockEnd) {

            /* We are decompressing in-place. Limit the output pointer so that we

             * don't overwrite the block that we are currently reading. This will

             * fail decompression if the input & output pointers aren't spaced

             * far enough apart.

             *

             * This is important to set, even when the pointers are far enough

             * apart, because ZSTD_decompressBlock_internal() can decide to store

             * literals in the output buffer, after the block it is decompressing.

             * Since we don't want anything to overwrite our input, we have to tell

             * ZSTD_decompressBlock_internal to never write past ip.

             *

             * See ZSTD_allocateLiteralsBuffer() for reference.

             */

            oBlockEnd = op + (ip - op);

        }



        switch(blockProperties.blockType)

        {

        case bt_compressed:

            decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oend-op), ip, cBlockSize, /* frame */ 1, not_streaming);

            decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oBlockEnd-op), ip, cBlockSize, /* frame */ 1, not_streaming);

            break;

        case bt_raw :

            /* Use oend instead of oBlockEnd because this function is safe to overlap. It uses memmove. */

            decodedSize = ZSTD_copyRawBlock(op, (size_t)(oend-op), ip, cBlockSize);

            break;

        case bt_rle :

            decodedSize = ZSTD_setRleBlock(op, (size_t)(oend-op), *ip, blockProperties.origSize);

            decodedSize = ZSTD_setRleBlock(op, (size_t)(oBlockEnd-op), *ip, blockProperties.origSize);

            break;

        case bt_reserved :

        default: