From patchwork Sun Jul 3 14:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2247260pzh; Sun, 3 Jul 2022 07:18:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u83y13+cbF5LqzK4KMhOfFJ7I7tYzvU9WhOvSDsejYZdQznJKQxnPjeWVnMZzetrUFmNj0 X-Received: by 2002:a17:907:7b86:b0:726:ccd7:4ca4 with SMTP id ne6-20020a1709077b8600b00726ccd74ca4mr24514916ejc.72.1656857923212; Sun, 03 Jul 2022 07:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656857923; cv=none; d=google.com; s=arc-20160816; b=cUwkDJhH8Dtnpkl2jSKset+5wYnDBQkTej9rI2/MSp0G7CXzCcxiIC7dxX59hXBxX3 eMAkojHHvV4FyuXWzCf1C99Z3wPAPkVAu/uZxhRNyAwxgCqxKRmaBCBE7kASAhRdZKzN oDG25jbwy7gJWK4iY2CCVzpkCX5ON1MjPCkwx2p06Ta0R04Hqua9o1Yj1yQI4kzhAId5 J+Aty1LVB88W0xR+t7115qnIAaM9UvyF9DyPxC++KkOx+xxmVGue03uSUNtHax/7o8+H i7yJGK85NnyMhtAegcfR1kEupAyrSnIpwhrs/oXEYPUfPOSRf+ciDwbxj6RkZGHx7SHj UMPA== 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=PLQcBu9cy5XBrrPlEFCobGPj/T4v7w5HXtzfq3YXGLc=; b=djTtp9Yzo78gcnoifJus9F+rOA/Id22cbiTfEIoDMkL5Oc+rO/kI1mY7+EnkR9QPJ5 hDHXcVkmf/pxHMt5Icxr2ow1Nd7BstFc7R9S7J8mcC6KQvIDCof6g0ogkImo53eX4clB igOCFP7eITzgMuGBvP48b7KBQty7z2yZIrs+3OOdUY7fUsxRJUn6Xl0Sd5ni495WOWFL D1/R4reU/qo9Wszw/dhjQ3LIYR+5L0V6iR8o9qPoGGT4E6X7DY1gsT5jdtB3ZVw7MncW c04TVOnkyXYwVwkW9M5gIL3g+qzyIkh3+vQ6AC6aGwg7NEHW/0UGfGw8PURyf9FVeeSM WTHg== 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 e9-20020a170906044900b0072694ef6015si13977445eja.233.2022.07.03.07.18.42; Sun, 03 Jul 2022 07:18:43 -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 0C5AC68B9F7; Sun, 3 Jul 2022 17:18:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39F8268B9C2 for ; Sun, 3 Jul 2022 17:18:14 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o80QO-0087dG-Tg for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 16:18:12 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80PooJRVx8s8U80QOog5Rw; Sun, 03 Jul 2022 16:18:12 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 80QOou6WmOPqF80QOoCsMk; Sun, 03 Jul 2022 16:18:12 +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=OcX7sjfY c=1 sm=1 tr=0 ts=62c1a524 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=yQYYN4lxI-LwPXhzJFIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 16:18:11 +0200 Message-Id: <20220703141811.29914-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703141811.29914-1-michael@niedermayer.cc> References: <20220703141811.29914-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPiXcHc3h+Btn1JIJmTkcuo/ieBiKzXOUffw14VcPtT6F6hQCGgAGtoYrWa+7gomAvwJ4tdHsoMbE9vf+Tv5OB6x2B+T4SIoVJTMidpLCsFE80S/SNAm z/QZpOyGqP7kPmm/tPZC6/9Bp5RTMVAtDj5YzGr6NM9zdxMdPUbsoQclXapJ7OExXLnU4gu7rZz87w== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/ffv1dec: Check for min packet 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: wJnVbu5p7vmK Fixes: Timeout Fixes: 48619/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5793597923917824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 7731c15c87..01ddcaa512 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -879,6 +879,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, p->key_frame = 0; } + if (f->ac != AC_GOLOMB_RICE) { + if (buf_size < avctx->width * avctx->height / (128*8)) + return AVERROR_INVALIDDATA; + } else { + if (buf_size < avctx->height / 8) + return AVERROR_INVALIDDATA; + } + ret = ff_thread_get_ext_buffer(avctx, &f->picture, AV_GET_BUFFER_FLAG_REF); if (ret < 0) return ret;