Skip to content

Commit 4497822

Browse files
keesptr1337
authored andcommitted
lib: zstd: Refactor intentional wrap-around test
In an effort to separate intentional arithmetic wrap-around from unexpected wrap-around, we need to refactor places that depend on this kind of math. One of the most common code patterns of this is: VAR + value < VAR Notably, this is considered "undefined behavior" for signed and pointer types, which the kernel works around by using the -fno-strict-overflow option in the build[1] (which used to just be -fwrapv). Regardless, we want to get the kernel source to the position where we can meaningfully instrument arithmetic wrap-around conditions and catch them when they are unexpected, regardless of whether they are signed[2], unsigned[3], or pointer[4] types. Switch to a more regular type for a 64-bit value and refactor the open-coded wrap-around addition test to use subtraction from the type max (since add_would_overflow() may not be defined in early boot code). This paves the way to enabling the wrap-around sanitizers in the future. Link: https://git.kernel.org/linus/68df3755e383e6fecf2354a67b08f92f18536594 [1] Link: KSPP#26 [2] Link: KSPP#27 [3] Link: KSPP#344 [4] Cc: Nick Terrell <[email protected]> Cc: Paul Jones <[email protected]> Cc: Sedat Dilek <[email protected]> Cc: Oleksandr Natalenko <[email protected]> Cc: Xin Gao <[email protected]> Signed-off-by: Kees Cook <[email protected]>
1 parent 03533df commit 4497822

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/zstd/decompress/zstd_decompress.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity,
618618
* @return : decompressed size of the frames contained */
619619
unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
620620
{
621-
unsigned long long totalDstSize = 0;
621+
U64 totalDstSize = 0;
622622

623623
while (srcSize >= ZSTD_startingInputLength(ZSTD_f_zstd1)) {
624624
U32 const magicNumber = MEM_readLE32(src);
@@ -636,7 +636,7 @@ unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
636636
{ unsigned long long const fcs = ZSTD_getFrameContentSize(src, srcSize);
637637
if (fcs >= ZSTD_CONTENTSIZE_ERROR) return fcs;
638638

639-
if (totalDstSize + fcs < totalDstSize)
639+
if (U64_MAX - totalDstSize < fcs)
640640
return ZSTD_CONTENTSIZE_ERROR; /* check for overflow */
641641
totalDstSize += fcs;
642642
}

0 commit comments

Comments
 (0)