From patchwork Thu Jun 10 13:58:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp542011iol; Thu, 10 Jun 2021 07:08:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3KCDrlQja2vKvw70p69Eob5oTNe5OzWyTQjcXQRQDFYXBkGwtbvoU9KupZjKTQ/b9r9Ya X-Received: by 2002:a17:906:9bce:: with SMTP id de14mr4743199ejc.353.1623334093143; Thu, 10 Jun 2021 07:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623334093; cv=none; d=google.com; s=arc-20160816; b=jeQaQBBShE6kQdm2vixhBAW0EHXmhcKBbKyOmZkrAFtFm7nXrSz06CKR5JHvqOx3nE MN7hEFjU+cO9kn1UXu8WnpOw5jYPcPHxj8tplZkcFYy6CXyFnpx1Pq1CkckuCH0C245X G1O/3KE2aLYVAIAapQpxjI6EVHMfxLSrIFsXLhf5Yo/y94GORszkeLKXi6veRulDGymR oFGvPpikPPSDiOWI6NuS7XFLTfeZabHK3PJ9xvlddof0itf52TiMYhHk7go+oy6XMo8H TY3DZXGJLTYnq8NmiqQTv7moFvyarSabmqqi54lyrbMxvB279kyAu213lEY6Mb/v/4LM u1hg== 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=KxHCidbjMt6+en5J/eduXfFxxO2M2IoLtODURJsDv7E=; b=qeSLeU4vl3KD1EJ7ps1yCexaAxKV32IB/Wftlr+C8oDTVfCDJxUNML8AL/NHugVJF7 eNaRd9kzUHWNoXMMuIXgWblM00lFz6pPc6zlvOAfiY/wxcsKXXFDkXyw/F4lMU/Uo2EU jxZf2DjzmF9yQWHKwNNV1tMYASRpzwvlSPIdf2BDuDNVcBm0xtxWiw0Xfnima/+EZ5q8 zq6HrYS3QoeKtd4ce0id5+BOArgWNx8QlnrPQ1EYc9ju+FkJ076ft9jSnb2YsS7VMafh D8j1kax/NeE5ccp8U7L8sJsC7dVArv0tkD0X8et59tUrTDZkQE+lvAo8eFZYx7aUhtQU DKHw== 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 bc14si2195247edb.374.2021.06.10.07.08.12; Thu, 10 Jun 2021 07:08: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 552D1687F4E; Thu, 10 Jun 2021 17:08:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB36E687FC5 for ; Thu, 10 Jun 2021 17:08:03 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lrLDE-00GGdl-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 rLCGlWut5ljeHrLCGlEfzG; 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=zW-1aYe8GScbCJj_:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=hc4XRVe5wdlS_nDceQYA:9 a=zd7A5YbfTe0hLeZaV-0S:22 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=QOGEsqRv6VhmHaoFNykA:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 10 Jun 2021 15:58:10 +0200 Message-Id: <20210610135811.21320-2-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 2/3] avcodec/faxcompr: Check if bits are available before reading in cmode == 9 || cmode == 10 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: KptW0WQKzoxe 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index d44de2485d..45e0c482d7 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -304,7 +304,10 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, mode = !mode; } } else if (cmode == 9 || cmode == 10) { - int xxx = get_bits(gb, 3); + int xxx; + if (get_bits_left(gb) < 3) + return AVERROR_INVALIDDATA; + xxx = get_bits(gb, 3); if (cmode == 9 && xxx == 7) { int ret; int pix_left = width - offs;