From patchwork Tue Jul 19 11:34:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1686562pzb; Tue, 19 Jul 2022 04:35:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vHbC0VvG+tliiQalZhTH4s5VCa6+O+0gZ4I5oS8zxASc+hKmqa8oOj8lJKknL7eHI+NEP2 X-Received: by 2002:a05:6402:48c:b0:43a:8bc7:f440 with SMTP id k12-20020a056402048c00b0043a8bc7f440mr43147576edv.8.1658230513316; Tue, 19 Jul 2022 04:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230513; cv=none; d=google.com; s=arc-20160816; b=XE6jqo+qJqrOnv54PT6DXeXqpAnJbS4WSc0tIqGjfM4Xi7FYbaDXuZ10xsyo4fnZd7 DPzPpi1lmITL2hUnjlG4WDAS9bheoSur28mMVA3udgJycuBQ7JvNdX/GGoBMjHrSe51F mxNNVK/8Hgc+hhZoLAOwWwJ5rmcRxeCYbLGWCYqdhs5fmQiKNm4Z3E7I8oXqSErqOAep f/M54ix50Kz4j9zVefG+DSt8o1dzii2kBqv0u4BfhNJ+bUJvwsNH5Xtf3BWWgC6Do6pt 4gCYuo6yEmjh7cG0H6tJ6L2U6qjZs96wwCe6wdKHYf5YNHdzEPQFHOuntdksLNoUAAlq DQgw== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=6jtZ6cTSYs1u62f0jDujOiyEZApPa70mjvB/GzFS4zg=; b=lGEjpLuTlmfwbviU2FT7W1QYxctGKI4s1Aaiz4rFvNpelxi0H+gy3Hqjy4xjjL3/lL VGpUosXZfF5Uj7aq+CZtNaQopXvtvhhFasK6qkdOYgo7T5O0EmjAi5yA1HcC6oZlI0SP CABnr2x1cK08ImRTxnk6Wb17Qt7yGMSlKJ0EVLyRiJZam9oZ9VAzpw63pr/UkBpvuwqz Klsk8ESUPNjw8yC5C9IIYAEr3T+J4Q7E8KQT3qfw+yv3amGOqF7YsU16KcVEfEsN6CZf oDpIxR9Ch7AInL5SHpxXRuO65wvyI9l6d00xaOXio5xjoyNJvQAf2E4hg1KUNM645s6W Ir4A== 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 dr11-20020a170907720b00b0072f3a7e584fsi7196957ejc.958.2022.07.19.04.35.12; Tue, 19 Jul 2022 04:35:13 -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 7028268B440; Tue, 19 Jul 2022 14:35:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5DC468B1AE for ; Tue, 19 Jul 2022 14:34:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDlV9-00FNxL-3o for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:34:55 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlUVop6Na8s8UDlV9oToiK; Tue, 19 Jul 2022 13:34:55 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id DlV8ova8q8eSWDlV9oAvdL; Tue, 19 Jul 2022 13:34:55 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62d696df a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=CVMNtwDyNrjo306PlQwA:9 a=pZYCB35So1-LydZ1GzXs:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:52 +0200 Message-Id: <20220719113453.23169-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGJ6I8lmd8m9TkPJARBPvLV/zCuJXg5i9n0rP/7XGSgL63bkCatFDnfIooyt9q4C3lc19MEBrMPWQw1rkHF+HfU/VvqhtKh+78TvYNaLc71oDO2etgg4 fkW9w0bNT6oHu1bRNVEzefjixE5eQ35dWcYHui0ypW2UolfwGp9x1f+JoP17qVfvteTqXB78cw/tQQ== Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/ffv1dec: consider run increase in minimal golomb frame size 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: CsQKln+o2n1b Fixes: Timeout Fixes: 49160/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5672826144686080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 01ddcaa512..9bdac0be4e 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -883,7 +883,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (buf_size < avctx->width * avctx->height / (128*8)) return AVERROR_INVALIDDATA; } else { - if (buf_size < avctx->height / 8) + int i; + int w = avctx->width; + for (i = 0; w > (1<height + i + 6)/ 8) return AVERROR_INVALIDDATA; }