From patchwork Thu Jun 10 13:58:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp538887iol; Thu, 10 Jun 2021 07:05:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzavn06VrZiVn/x86koOX1MrU+ZMfS5r7CxuUV5knUlA6X53YHHCL4ALpLrAvm09csXTaoP X-Received: by 2002:a05:6402:3123:: with SMTP id dd3mr4923241edb.113.1623333908698; Thu, 10 Jun 2021 07:05:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623333908; cv=none; d=google.com; s=arc-20160816; b=w5XO8JT2dR2JCeN6Ob/7DG45WtVoPcIQ3pFL8K+UAKiYXjRpj97uBwgdfKZgKfkR8Z KBi4TNG0YuHgNajzRwngRbuRcV1S8peS9kM9dzy+K+TYppLKgBANL9UcAzYYK92c8pO2 iwH12tV/lbiZyGOw/S/nvmZ3LEAPSkYakk62ibkR+hmtx/URLwuA3nra7srqnM0mMbAF qYyGcXlRsf1n8s7N5VoVXqmZVhV/vPKU9RVl8Nip/CZakXjYgq3LFpXMOd6QjbUs5vXN GOG/oLWTXkouakC05dZ5Q+v4del1sI7eIXNYQxoe9+WT3monK5eBCecaNhle/IMvn191 fAVw== 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=5/vE+DGpNCiVtEDiIiZAr2ehQChg+cOSjNBJ4YAsrIA=; b=ymWt8CAjLQzpSPq/0HAvBcVml51dOJ7FVO24nGuJ6bsjbxOQHLQbGQbIma/JKx5Fzz Iw+JSNUrJFJ1IK4ygVvJ3KtsddMzbwPa6qwNN7tuDRZ9pQIGIish65qN926IsXcd/o8R MikdpKpTSFCorCv5VImzPyAPABWy5N04Upp7hpMnNtv2UDCxVNMyUxyGqU11rEsygV06 0eGU9BSUF1V+hRzWIADRxyeVL1BY7yn0YY2XfIyVvs+hAetvrQCqaDMNeSykYxXe1CK0 lyitqoAfhv/TV0usWcxavXMRv8ar3O9GfOeNunRE7LP/YcmG04UHY56FK3yu7CxIPCa4 Lpaw== 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 f23si2336743eds.118.2021.06.10.07.05.07; Thu, 10 Jun 2021 07:05:08 -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 08D8E680BA4; Thu, 10 Jun 2021 17:05:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D007E68052A for ; Thu, 10 Jun 2021 17:04:57 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lrLDE-009054-0F for ffmpeg-devel@ffmpeg.org; Thu, 10 Jun 2021 15:59:12 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rLCGlWutVljeHrLCGlEfzV; Thu, 10 Jun 2021 15:58: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.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=ULs1g33ywhgt8IEo-ikA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 10 Jun 2021 15:58:11 +0200 Message-Id: <20210610135811.21320-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210610135811.21320-1-michael@niedermayer.cc> References: <20210610135811.21320-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCGYLHY1Pl3SYaH7jy7mLVgcvFneiG5bO1hpYYL/D+VJ+Lg4lfM3EhAW6c+lFg7xKXI8OEnGHD9Ebng0I7a7RrUgEaVumo+nsXjGPq7j9t6pAPrK44dh PYfaY3xqN9Klu1NBKpT9DsndwYvAAv9fJf8PjAWMqycQ89fagVITqvNc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/faxcompr: Check available bits in decode_uncompressed() 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: UcyiZUkHvQLD Fixes: Timeout Fixes: 34950/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5686764151898112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/faxcompr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 45e0c482d7..44c1f6f6b9 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -144,6 +144,8 @@ static int decode_uncompressed(AVCodecContext *avctx, GetBitContext *gb, return AVERROR_INVALIDDATA; } cwi = 10 - av_log2(cwi); + if (get_bits_left(gb) < cwi + 1) + return AVERROR_INVALIDDATA; skip_bits(gb, cwi + 1); if (cwi > 5) { newmode = get_bits1(gb);