From patchwork Thu Apr 29 15:13:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp1581116pxb; Thu, 29 Apr 2021 08:15:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNnaSZLh5nU5lnJLpGELxLpF6q3Obvzk4FRe00sbG6f7lqaRIqLF19DUQ/hE7XVJby8X+b X-Received: by 2002:a17:906:c289:: with SMTP id r9mr307591ejz.469.1619709312098; Thu, 29 Apr 2021 08:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619709312; cv=none; d=google.com; s=arc-20160816; b=ozdSvOHkCjalahqwetdZ62oDwV+gQbsmYEaKa6yXpGMnUIGWkoABpq+4pXvIJiB9f0 qJhZ+UFg+dlUUHFJTgDXz0fpkKeW/OXrvfP6ol5aw6BdZvVpFmjZBPpxXTjbqCUeV5/6 CY3AxOYEYF8QybiHlDgsP9YUPM3AEe0pO8PClAdkIXnizcwXCNFRIRtFBnqojWjoZj1H Q1QJXE9gVmc/XvA7+jSB2GHSAiYZK12YGUxrqpOnZ057Cf+eSYRBzNQCk7uL49YJ/+jA Rs1eggcI/1Lg4tEEd7RDvVotNyhaQf0HgIlvlZphwkiRnZf38BFVe3lpW3pOi5wRxQQ6 btLA== 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:message-id:date:to:from:delivered-to; bh=iGIkPcBY4n9lA22cWrOuF07OCZPLTSaA9gnvmOCtapQ=; b=j8tcxPGaoJCY2v7IyPoz4MXhKtie6BGy64x13xsnCddeAxFEWyvstbh/WxGuv0e2Lf kthQdxrgBzO9jKXjq9GRFKhGZrIS/rrQ+6XGCvSixrq3dE0Loq+r6SkI4LYtgCHeokEK sTmjGCI223jxzkbRnVhMX8hpVnMDj7RUUhFoL4C8uykbdDCGjchuDXLfx7a8LWNqoSYS 7Ylq05iXAflsWbh+FBud+QB7WIXt2m9jUE48rOMWoLksIvvDm9x9+ysLH3R2F5jRjsCg SyeULYAIxyBrjd3sHo0dtC/+vrF9dlZ6EYb6kItnNo7GM2Ek4zciz1F7ABk5ldPqUfGJ ptmg== 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 v5si1973756edx.142.2021.04.29.08.15.09; Thu, 29 Apr 2021 08:15: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 EA355689F19; Thu, 29 Apr 2021 18:15:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADA0F68812C for ; Thu, 29 Apr 2021 18:14:59 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lc8NX-00FC8P-0I for ffmpeg-devel@ffmpeg.org; Thu, 29 Apr 2021 17:14:59 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id c8MYl6jpdljeHc8MYlY9mu; Thu, 29 Apr 2021 17:13:58 +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=0zfv5mHQOiW8wcODwUgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 29 Apr 2021 17:13:58 +0200 Message-Id: <20210429151358.10952-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCgtq/R/M31GEIvtxRDedvARG/DBFwtRmJzAjpbidUf15BTP1GHHLuYRXLb9/b4cbHoe0tNsjvYskLjSkLCqL+x4kBlyZeoJz6Pe1BCLObUuuxw9sAFs cgutAxwfkM/RUPDUPk174eYMw8XXx/XTfWPbgrk3XhBRdy1rqz3S0bNW Subject: [FFmpeg-devel] [PATCH] avcodec/faxcompr: Check for end of bitstream in decode_group3_1d_line() and decode_group3_2d_line() 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: e/iO/usUpdaA Fixes: infinite loop Fixes: 33674/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4816457818046464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/faxcompr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 7bf11d80ca..1fc4aca0b3 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -209,6 +209,8 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, unsigned int run = 0; unsigned int t; for (;;) { + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2); run += t; if (t < 64) { @@ -254,6 +256,8 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, unsigned int offs = 0, run = 0; while (offs < width) { + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1); if (cmode == -1) { av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");