5717bd39ee
When the output buffer is `NULL` with size 0, but the frame content size is non-zero, we will write to the NULL pointer because our bounds check underflowed. This was exposed by a recent PR that allowed an empty frame into the single-pass shortcut in streaming mode. * Fix the bug. * Fix another NULL dereference in zstd-v1. * Overflow checks in 32-bit mode. * Add a dedicated test. * Expose the bug in the dedicated simple_decompress fuzzer. * Switch all mallocs in fuzzers to return NULL for size=0. * Fix a new timeout in a fuzzer. Neither clang nor gcc show a decompression speed regression on x86-64. On x86-32 clang is slightly positive and gcc loses 2.5% of speed. Credit to OSS-Fuzz.
178 lines
5.8 KiB
C
178 lines
5.8 KiB
C
/*
|
|
* Copyright (c) 2016-2020, Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under both the BSD-style license (found in the
|
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
|
* in the COPYING file in the root directory of this source tree).
|
|
* You may select, at your option, one of the above-listed licenses.
|
|
*/
|
|
|
|
/**
|
|
* This fuzz target performs a zstd round-trip test (compress & decompress),
|
|
* compares the result with the original, and calls abort() on corruption.
|
|
*/
|
|
|
|
#define ZSTD_STATIC_LINKING_ONLY
|
|
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "fuzz_helpers.h"
|
|
#include "zstd_helpers.h"
|
|
#include "fuzz_data_producer.h"
|
|
|
|
ZSTD_CCtx *cctx = NULL;
|
|
static ZSTD_DCtx *dctx = NULL;
|
|
static uint8_t* cBuf = NULL;
|
|
static uint8_t* rBuf = NULL;
|
|
static size_t bufSize = 0;
|
|
|
|
static ZSTD_outBuffer makeOutBuffer(uint8_t *dst, size_t capacity,
|
|
FUZZ_dataProducer_t *producer)
|
|
{
|
|
ZSTD_outBuffer buffer = { dst, 0, 0 };
|
|
|
|
FUZZ_ASSERT(capacity > 0);
|
|
buffer.size = (FUZZ_dataProducer_uint32Range(producer, 1, capacity));
|
|
FUZZ_ASSERT(buffer.size <= capacity);
|
|
|
|
return buffer;
|
|
}
|
|
|
|
static ZSTD_inBuffer makeInBuffer(const uint8_t **src, size_t *size,
|
|
FUZZ_dataProducer_t *producer)
|
|
{
|
|
ZSTD_inBuffer buffer = { *src, 0, 0 };
|
|
|
|
FUZZ_ASSERT(*size > 0);
|
|
buffer.size = (FUZZ_dataProducer_uint32Range(producer, 1, *size));
|
|
FUZZ_ASSERT(buffer.size <= *size);
|
|
*src += buffer.size;
|
|
*size -= buffer.size;
|
|
|
|
return buffer;
|
|
}
|
|
|
|
static size_t compress(uint8_t *dst, size_t capacity,
|
|
const uint8_t *src, size_t srcSize,
|
|
FUZZ_dataProducer_t *producer)
|
|
{
|
|
size_t dstSize = 0;
|
|
ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
|
|
FUZZ_setRandomParameters(cctx, srcSize, producer);
|
|
|
|
while (srcSize > 0) {
|
|
ZSTD_inBuffer in = makeInBuffer(&src, &srcSize, producer);
|
|
/* Mode controls the action. If mode == -1 we pick a new mode */
|
|
int mode = -1;
|
|
while (in.pos < in.size || mode != -1) {
|
|
ZSTD_outBuffer out = makeOutBuffer(dst, capacity, producer);
|
|
/* Previous action finished, pick a new mode. */
|
|
if (mode == -1) mode = FUZZ_dataProducer_uint32Range(producer, 0, 9);
|
|
switch (mode) {
|
|
case 0: /* fall-through */
|
|
case 1: /* fall-through */
|
|
case 2: {
|
|
size_t const ret =
|
|
ZSTD_compressStream2(cctx, &out, &in, ZSTD_e_flush);
|
|
FUZZ_ZASSERT(ret);
|
|
if (ret == 0)
|
|
mode = -1;
|
|
break;
|
|
}
|
|
case 3: {
|
|
size_t ret =
|
|
ZSTD_compressStream2(cctx, &out, &in, ZSTD_e_end);
|
|
FUZZ_ZASSERT(ret);
|
|
/* Reset the compressor when the frame is finished */
|
|
if (ret == 0) {
|
|
ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only);
|
|
if (FUZZ_dataProducer_uint32Range(producer, 0, 7) == 0) {
|
|
size_t const remaining = in.size - in.pos;
|
|
FUZZ_setRandomParameters(cctx, remaining, producer);
|
|
}
|
|
mode = -1;
|
|
}
|
|
break;
|
|
}
|
|
case 4: {
|
|
ZSTD_inBuffer nullIn = { NULL, 0, 0 };
|
|
ZSTD_outBuffer nullOut = { NULL, 0, 0 };
|
|
size_t const ret = ZSTD_compressStream2(cctx, &nullOut, &nullIn, ZSTD_e_continue);
|
|
FUZZ_ZASSERT(ret);
|
|
}
|
|
/* fall-through */
|
|
default: {
|
|
size_t const ret =
|
|
ZSTD_compressStream2(cctx, &out, &in, ZSTD_e_continue);
|
|
FUZZ_ZASSERT(ret);
|
|
mode = -1;
|
|
}
|
|
}
|
|
dst += out.pos;
|
|
dstSize += out.pos;
|
|
capacity -= out.pos;
|
|
}
|
|
}
|
|
for (;;) {
|
|
ZSTD_inBuffer in = {NULL, 0, 0};
|
|
ZSTD_outBuffer out = makeOutBuffer(dst, capacity, producer);
|
|
size_t const ret = ZSTD_compressStream2(cctx, &out, &in, ZSTD_e_end);
|
|
FUZZ_ZASSERT(ret);
|
|
|
|
dst += out.pos;
|
|
dstSize += out.pos;
|
|
capacity -= out.pos;
|
|
if (ret == 0)
|
|
break;
|
|
}
|
|
return dstSize;
|
|
}
|
|
|
|
int LLVMFuzzerTestOneInput(const uint8_t *src, size_t size)
|
|
{
|
|
size_t neededBufSize;
|
|
|
|
/* Give a random portion of src data to the producer, to use for
|
|
parameter generation. The rest will be used for (de)compression */
|
|
FUZZ_dataProducer_t *producer = FUZZ_dataProducer_create(src, size);
|
|
size = FUZZ_dataProducer_reserveDataPrefix(producer);
|
|
|
|
neededBufSize = ZSTD_compressBound(size) * 15;
|
|
|
|
/* Allocate all buffers and contexts if not already allocated */
|
|
if (neededBufSize > bufSize) {
|
|
free(cBuf);
|
|
free(rBuf);
|
|
cBuf = (uint8_t*)FUZZ_malloc(neededBufSize);
|
|
rBuf = (uint8_t*)FUZZ_malloc(neededBufSize);
|
|
bufSize = neededBufSize;
|
|
}
|
|
if (!cctx) {
|
|
cctx = ZSTD_createCCtx();
|
|
FUZZ_ASSERT(cctx);
|
|
}
|
|
if (!dctx) {
|
|
dctx = ZSTD_createDCtx();
|
|
FUZZ_ASSERT(dctx);
|
|
}
|
|
|
|
{
|
|
size_t const cSize = compress(cBuf, neededBufSize, src, size, producer);
|
|
size_t const rSize =
|
|
ZSTD_decompressDCtx(dctx, rBuf, neededBufSize, cBuf, cSize);
|
|
FUZZ_ZASSERT(rSize);
|
|
FUZZ_ASSERT_MSG(rSize == size, "Incorrect regenerated size");
|
|
FUZZ_ASSERT_MSG(!FUZZ_memcmp(src, rBuf, size), "Corruption!");
|
|
}
|
|
|
|
FUZZ_dataProducer_free(producer);
|
|
#ifndef STATEFUL_FUZZING
|
|
ZSTD_freeCCtx(cctx); cctx = NULL;
|
|
ZSTD_freeDCtx(dctx); dctx = NULL;
|
|
#endif
|
|
return 0;
|
|
}
|