From patchwork Sun Oct 3 13:36:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3433737iob; Sun, 3 Oct 2021 06:37:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzscZA8qjOz0ijqTn2hRuvivXeRErgWgVBovcPFALf3h3GIex5q9pglC21br8gkdmAOl1th X-Received: by 2002:aa7:d59a:: with SMTP id r26mr11111483edq.86.1633268250455; Sun, 03 Oct 2021 06:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633268250; cv=none; d=google.com; s=arc-20160816; b=SX9pMXBoaW1BEj+MiKd0rR3yxF5xdG/+OV7PxAczQ4dR9f5UKfO0Z2j2ZtULVpJAgl XxV7rbGuQfyoB8p3zH7suR7gz7d8FCb6vP3n/M4IR0E+gP9avGDRucp3Zv5tKkwk4Qd9 /0wgpsq6lU5f048IdvIt4+NPK987dnFMG/pXS5lJGcnHBv1rJ1+7l/qGmxcIYb+Zkhby idf576I1h8e/N68bL67klcoexP4SxCdWNwp5bvatkBqxJiiye6JDzfgxAOluOKOk5ECY i9TKTOXBo+sJFodfpmhQKDYH3gGUcqXKgYYetXD7D6yNRoafbQn0MOT4niKzUFHqMoX8 9TBQ== 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=xjMxEeEOgUcu5FpFDYgPOe3/fDt+yIEoL8B6gawZXVQ=; b=A0GUoGnoL5/ukxczQ1lNVCrA4Tp8CHdP9qBBX1IMv3UHalIv2qiMh8TZjp4f/Efkz+ cU2Wd4DUKC76LqMSbVNrJ37niB8LK7trgAlvSRgJOts4K2AAlvYpBZ2BmziweeXI3c38 z5pYrwiNAGPF2d+bUE5rl8boi4+0sD8fb1iNTSKO8Hd62OwFHqo5YUsta8bRVh1vyQjk JR1+as6NLvP2MYar+1ra6PD5KueonQwZbmwk09ExozuuMO25frKbE7hqpKI3oS6ymRnp OlrvDbXnhzhzF36AaxD7sqPqrvyEbqB5vLU8gINvH1fw3WYYyKcSPlwVUz/sPoJIdIuT dugw== 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 28si14146240ejg.200.2021.10.03.06.37.30; Sun, 03 Oct 2021 06:37:30 -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 641E568A807; Sun, 3 Oct 2021 16:37:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A4FF68A5F0 for ; Sun, 3 Oct 2021 16:37:08 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mX1fv-007EnR-0C for ffmpeg-devel@ffmpeg.org; Sun, 03 Oct 2021 15:37:07 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X1ewmMhholjeHX1ewmMsjg; Sun, 03 Oct 2021 15:36:06 +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=NEAV23lmAAAA:8 a=dXPW6GeVbUKEYmNBo0AA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Oct 2021 15:36:05 +0200 Message-Id: <20211003133606.30712-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKMZqhLg1daDmAthNdfDk0I5c3vxFhYFDmgGMPHq8DyBoV06iGzwfj+jCAbc36LBdJoMy8fx8VANMuMkuk6MSNx3M8nUNndcDvGvIT4Yk5ABZFz9kfrx /TguDRnl0J4+l+9Bz3cxLbFz4F1wSt0OBJCV3tCGFmwVTAnFti8Wk2Pe Subject: [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Disable MB debug after a few iterations 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: egJJElVTGEj0 This debug code can be quite slow on constructed streams Fixes: Timeout Fixes: 38907/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6334628852531200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 88002316916..d56d856d51a 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -391,8 +391,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { decode_more = ret >= 0; if(!decode_more) { ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL); - if (it > 20 || ec_pixels > 4 * ctx->max_pixels) + if (it > 20 || ec_pixels > 4 * ctx->max_pixels) { ctx->error_concealment = 0; + ctx->debug &= ~(FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE); + } if (ec_pixels > maxpixels) goto maximums_reached; } @@ -405,8 +407,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { int ret = decode_handler(ctx, frame, &got_frame, avpkt); ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL); - if (it > 20 || ec_pixels > 4 * ctx->max_pixels) + if (it > 20 || ec_pixels > 4 * ctx->max_pixels) { ctx->error_concealment = 0; + ctx->debug &= ~(FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE); + } if (ec_pixels > maxpixels) goto maximums_reached;