From patchwork Tue Jul 6 16:08:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5241113ios; Tue, 6 Jul 2021 09:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYgbvekQl1wkCDt4B49+0ITk+v4yifkldUWcyGoMDS0/TNrCG+SRaOqSpEA83EiJnWOagd X-Received: by 2002:a17:907:9495:: with SMTP id dm21mr19142048ejc.526.1625587754836; Tue, 06 Jul 2021 09:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625587754; cv=none; d=google.com; s=arc-20160816; b=jzX3Y9nKLggGbsrvFOGdBySnASEQjcFsYy+4TJ0w7mNE2p8G9X+//TCgfVkqP19Nxj xXmsUCX4mcAtm/jG1MfuBvdR3UjVndZEq3nkhw2ZyUNzVPzZEaF9EhagtxM94ktq9+A5 rBmHqgJazcT8WWreZ8WvJUtDZX+cONWS/xuDWQlFjXSnKGX3ibVsq2QaScGKU2hF5Bi4 hVsmzAMtYcO4xvbQsVvw1XS4pwyApibvadt4/JiZ+z3CNo/81ZA2m0FwNlmH1CwfPVFf JPy+Mfara03jUX7tPODgzIqBOIiEnP/eJr4rKL+INPqO9lQrq6NWaL7Fg0nrVD2n11yC e92w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=SvHigDzNvP9Obf7+Owx3PE/jFDvWEKCy3qNKWn04vho=; b=Jo83qYkVOQtigtsP2PO46AQrEoRfDTncdtWCgifepqTlkxUZUiZQrGoNwwo10zv0Rl 7C0PDYXfvejVqzSfUCCTrYNoNFiQul3+HdSAoi8GqJf9gxGiawehG/N1B1/AKYJoUxr2 T0sP1fjT75p6nxbwKmzFp5JiXHAR/uRXThGau/WA8r7CkjMphJL0YSD6dzG+K5Hw/puC 7pX0AFFIH+coq/t7OgerOMH6cafPseo/MWgZwL+pUjL/+7DGequoL0wZ9/1QZKN+XKOj EIHXppO2h8Ew8rtuc45/fAfVUlVg5aMzJs1PjGb6IO/0eB7QOKkumVMcngRXHJ2lmxUL abiA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c18si15417164ede.436.2021.07.06.09.09.14; Tue, 06 Jul 2021 09:09:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C986668A71A; Tue, 6 Jul 2021 19:09:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A95B68A1BC for ; Tue, 6 Jul 2021 19:09:03 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m0nd8-00FfoM-0B for ffmpeg-devel@ffmpeg.org; Tue, 06 Jul 2021 18:09:02 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0nc9mHUupljeH0nc9m7cTq; Tue, 06 Jul 2021 18:08:02 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=B4-EOnwiFvald9pqeXcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 6 Jul 2021 18:08:01 +0200 Message-Id: <20210706160801.11973-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfE3xc9qZ/OVTqyOSywTu2TAp33j4zNbzobV6hw+UX4miKzFLZzF/isXJnSpVRJLnRXQxe2H+uE29PZq5y+GtJqwZzuBFKmwV5XQ8p51rDEcYL42hpaMp moChmI2Ah6pYuka+GTUyiiLScI6LfwRNSQ/PBcyTIsxSeIJOl8p4ldrN Subject: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: move maximum variables into function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Vt7jfWPplqZR This fixes an issue when multiple cases are fuzzed in a single run and the limits are adjusted by more than the iteration limit. In that case the adjusted limit leaked back into the global limit causing the fuzzer to become ineffective after several iterations, MSS2 was affected by this for example. Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 6092f6775d..96b8f81958 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -98,15 +98,15 @@ static int audio_video_handler(AVCodecContext *avctx, AVFrame *frame, // Ensure we don't loop forever const uint32_t maxiteration = 8096; -uint64_t maxpixels_per_frame = 4096 * 4096; -uint64_t maxpixels; - -uint64_t maxsamples_per_frame = 256*1024*32; -uint64_t maxsamples; static const uint64_t FUZZ_TAG = 0x4741542D5A5A5546ULL; int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + uint64_t maxpixels_per_frame = 4096 * 4096; + uint64_t maxpixels; + + uint64_t maxsamples_per_frame = 256*1024*32; + uint64_t maxsamples; const uint64_t fuzz_tag = FUZZ_TAG; const uint8_t *last = data; const uint8_t *end = data + size;