From patchwork Tue Nov 30 19:59:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8153887iob; Tue, 30 Nov 2021 12:01:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjEYkfv5QIsahKLYEGRnWUGUwWYMcWKw2NDS6H6qdFJfvxWhieHXj86Dezd7Ty2X6mob8F X-Received: by 2002:a05:6402:14f:: with SMTP id s15mr1675988edu.118.1638302473438; Tue, 30 Nov 2021 12:01:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638302473; cv=none; d=google.com; s=arc-20160816; b=nk4FCKvIMX/7GU3EB7mdcPfqAChaeTTvZmXKKumlrFQEA1IIPEifysYWdAH1rmtNsc L6tUtED33iiIEXtmcbmdzofA8BHvv1ImuoMw22kJyIjIY/A14AUM38I+9dVhK3Dr/Nbd 6PJvQVylD22n0aC0opWNg1TEi8Odaymrz8pBRyvmY22gGrNMO7VgeCXgTx9bzrMocIoc 4Cvqdh5VXbrLR3kSI7IgB4fbifE57ddGnKhKn5k3UogJGXVs8DhYJyuYmyVNzRfb6d71 P/7xK14XIaaRgG+/qoDDRtZDbWrxHsQYoDBTQZfEYolqD83MgJ+4WaNyqIno60vvVstp LZFA== 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=EJQeLSagwbA8PE2RbMECmVCSSvK8vj1L9NnJMYLle/E=; b=GyTBnXpMygUw8KxUIiO/LmdyxjUwpyQDsuZy1p7apwRZAV5EpKMmDK1QT/tsJaUmhV szJjAdRSQw26kuj8gYlqaeSKBJWRTINbueQX2Pci+wyztYzfudfLth5kPsIJRJpXit19 0SaAE/YTEzxb+fmHBS4GmxtbeCt6/3RpL8Yf7gRknVydxqR0NRJH/sZwmG6yyrB2vxjh zCnCRIZV7wG9tCE1Q2U4owJyOaExqhRs8XRxdcIq7ZZ4Rj+MRLbHwJZ3wOHbHBHb5H4m 7yNNMr4GTHBvCrSN5wLW7r/XC3pvq5pAnxJ9vfM2y3Zppg433kzfyxvykvgynwJpLWs4 ctJA== 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 g10si24686587edr.52.2021.11.30.12.01.12; Tue, 30 Nov 2021 12:01:13 -0800 (PST) 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 4693168AE8E; Tue, 30 Nov 2021 22:00:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22E646898F5 for ; Tue, 30 Nov 2021 22:00:38 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ms9Ir-007x0q-1X for ffmpeg-devel@ffmpeg.org; Tue, 30 Nov 2021 21:00:37 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id s9HsmsUpDSgGFs9HsmyaEF; Tue, 30 Nov 2021 20:59:37 +0100 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=f8Q2+96M 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=EYALbYCSAmzcIbgSxv4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 30 Nov 2021 20:59:34 +0100 Message-Id: <20211130195935.29259-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130195935.29259-1-michael@niedermayer.cc> References: <20211130195935.29259-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfL8p6BtTzec5g2c5M1KKg8atw/s4/WERNo/3iHsy/52ad4ADbt9Iwfc2VzyZZOc+Ke/kPQly2lIJAboTNFrTyf6kIX3P7OWcySd3mvqwg48hE9kh1OyX HlaBFP1LnGFifr6gET6T9iWkj40n1xUvmGBfJRfS8AHIvxnuEuAj2VJ+ Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vp3: Check version in all cases when VP4 code is not built 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: 2kaUWMqbBEYp Fixes: out of array read Fixes: 40284/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-4599568176644096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp3.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 16726080b35..5b9ba60f499 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2685,7 +2685,14 @@ static int vp3_decode_frame(AVCodecContext *avctx, skip_bits(&gb, 4); /* width code */ skip_bits(&gb, 4); /* height code */ if (s->version) { - s->version = get_bits(&gb, 5); + int version = get_bits(&gb, 5); +#if !CONFIG_VP4_DECODER + if (version >= 2) { + av_log(avctx, AV_LOG_ERROR, "This build does not support decoding VP4.\n"); + return AVERROR_DECODER_NOT_FOUND; + } +#endif + s->version = version; if (avctx->frame_number == 0) av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);