From patchwork Mon Apr 19 18:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp760282iob; Mon, 19 Apr 2021 11:30:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzn/ImCLAy2LN9k7LEAJ8AOa6PaSUxVGQAeG2Vm+abTZ/6UxlO2XAmISUWiyM0jBDAvLP7r X-Received: by 2002:a17:906:6703:: with SMTP id a3mr23198814ejp.240.1618857012260; Mon, 19 Apr 2021 11:30:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618857012; cv=none; d=google.com; s=arc-20160816; b=meVCdzaLttPxHm+uH/YzK8sgdB3g71MYl77eAtPZ2lHeyTA9MJ8V7ewvK+cSo5sJrj Wv2RJIe8YbX95wMW/J8tNtF8eqRc4ktZ08Ux80tomskhG62is3B22f9ve9zjbbLl/Bj3 /OrZPzHxk90sz13nTigzb8r0a+OH/SxWwQCd9zvmToF2BODxNVrFWJyTwqt3QTFwVNAT K3S6PeoZMJ0LJm7dDfJQqpxy+BIIyNZjN/Wq0OpF48rRhNISf4GZRfnoTyk0Zuso5NVd DcBZIwGDCtLpDC98tSQhGaiAtk18BPfOqAVevgc7TQ8dnPN6bH5FKx/O/SeXccwXnf2h mLlw== 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=r6jZ+eZGZnc8AAwiwI/2nRJaHsQ3Xzgy9Dr2MGHvGtY=; b=waD+I0nnFNf4H2tpczqU7kjqKT7tKdBwRT7YHXvXBuQTXbf+S47YZVBDC6Lfwl0u4w OcQgxqArc6dohx1AUtCOg85Ixk7AV68/CzLVb2Wo+UVGoJELHg8Tu/DSdNQgl9Nyir8F l/jcQoufGd90jEdH/Tx+XnsclXMw89U3sfelNvevEYif5Je7djBjOyk//NUsASZbkMav Tuo6iRw3uG1XJPp4IahPJBEO6eHWbQdKjYU3GjjNTP6jLAW6fKQuH/vueLIw1Z4WMFoW tSsIxQKpvA3KJNSGWDGSGvnnQFcOcw2A53Mh8VF/xg8/O3eM4QEC66Mf5D/7IzS4AiYj f+2w== 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 b16si7211794edw.227.2021.04.19.11.30.04; Mon, 19 Apr 2021 11:30:12 -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 11268687FAC; Mon, 19 Apr 2021 21:30:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD747680C80 for ; Mon, 19 Apr 2021 21:29:53 +0300 (EEST) 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 1lYYZk-00Aoaz-0T for ffmpeg-devel@ffmpeg.org; Mon, 19 Apr 2021 20:24:48 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id YYYmlPiAJljeHYYYmltlkO; Mon, 19 Apr 2021 20:23:48 +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=nZOtpAppAAAA:20 a=Rl2k9aLj2RxrNSmz_noA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=QOGEsqRv6VhmHaoFNykA:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 19 Apr 2021 20:23:42 +0200 Message-Id: <20210419182346.4445-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210419182346.4445-1-michael@niedermayer.cc> References: <20210419182346.4445-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBu2m8B3WDCMJZR0X7JeupBWSW0kdg0JYyJ1X2qwvyyQb45b+JHCi76evJxw5NDvs9UMP6yM9SIN6fNg4OLeUNceaAQ2wUU9IHLTOHsT7b0nZ8LCfj/B s2phGLuJCcxrbhcxtayuqxcZkJj4DNwCxWoNjJTOx+FO4EFmi3x43EII Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/vc1: Check remaining bits in ff_vc1_parse_frame_header() 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: rxt5haZe2Tu3 Fixes: Timeout Fixes: 33156/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV3_fuzzer-6259655027326976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vc1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b7140c089c..40e2b4d692 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -672,6 +672,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) if (v->s.pict_type == AV_PICTURE_TYPE_P) v->rnd ^= 1; + if (get_bits_left(gb) < 5) + return AVERROR_INVALIDDATA; /* Quantizer stuff */ pqindex = get_bits(gb, 5); if (!pqindex) @@ -764,6 +766,9 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " "Imode: %i, Invert: %i\n", status>>1, status&1); + if (get_bits_left(gb) < 4) + return AVERROR_INVALIDDATA; + /* Hopefully this is correct for P-frames */ v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables v->cbptab = get_bits(gb, 2);