From patchwork Tue Sep 14 20:58:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30250 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp5347623iov; Tue, 14 Sep 2021 13:59:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLBQxhkVQYTyc/CMPxlfQKA5MERLZw63RSgIhr0XMSPGSGjjMXd+b3kHaRDWRNsNF3t4pe X-Received: by 2002:a17:907:2d9f:: with SMTP id gt31mr21111319ejc.489.1631653191258; Tue, 14 Sep 2021 13:59:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631653191; cv=none; d=google.com; s=arc-20160816; b=VBaHVxzoIWqBvrUDTJDzw6QlsqVTt2XVPOviK9WIeBC8dU4HTZHWU1tn39Tc0mHV0n cl2jHJr89XQ8ZDyf4C0WOs8eAO62l6qVXG25lk6UbZP6GwYJ0Q4Us507tlH9ns0jnpRF 33RRxyQyME/cqdMfkVNxTdgdl6DYGGrPhxeTBvTNNF52MUs3/wZtQbIiyN7eWlDAz8Np Gq7BLnRs7KWo+lkhyunDuItVzfJHqXKDzEutHjT1frk9gaw9jAgXaCExoO9XsChiKkCt 9xKkDY7dFled9b91w8X5uw6y+xJhanqPpuZPBQDdL79M0oOpGCKwL5772jgduXMacqnQ 0DCA== 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=vQGC37iNCv0/Wd3CDex5mOTqh7/461HKedLnP1DMpzA=; b=urYcfPZbRBeKKbqrwn3UVdopxUsE3XmdvHP6mBPjqZcXXi/g/V4FA+lmxPkc+Kzkix gLemMo5XSrpwaL1N0hvU3QWZptmPprd760h3OJU6eX9PaLMfCe/wfI058pP/RVkNcbvr gG3o7zrit1vAFcrl5cFybxFAxl4M/TAPLmFcmMvk266ocCcMcot8z5ZEcLNI/9sME0tc snZuPZBQWv/OLP1xgi0UaiH8Y7zk+HPsxYlBPHfXSHNaaf2sNXl/CUtxHIOPqxTbuacR /WYghmBxqPyP2JpgJFR9qbc/STgUUMV00Tial5OiRVlPBuztihtjcMyefBLQu1tQVTDh 5pdQ== 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 a16si15749150ejk.287.2021.09.14.13.59.50; Tue, 14 Sep 2021 13:59:51 -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 ED1A668AF5B; Tue, 14 Sep 2021 23:59:29 +0300 (EEST) 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 6B3DF68ACF5 for ; Tue, 14 Sep 2021 23:59:21 +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 1mQFWT-00GzD1-0P for ffmpeg-devel@ffmpeg.org; Tue, 14 Sep 2021 22:59:21 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id QFVVmFUOiljeHQFVVmuUJd; Tue, 14 Sep 2021 22:58:21 +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=qj7dOcSdbWm7ISQJBb4A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 14 Sep 2021 22:58:20 +0200 Message-Id: <20210914205820.12598-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210914205820.12598-1-michael@niedermayer.cc> References: <20210914205820.12598-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMhEyINBE/HfLQRuAqFdi7ZFmbHIPu76MYdXnggawPxTZq6rCLzzsEkvEZZIWopR0f4+Jdk31zLxAbhVwY4kBYeNTu3oPJNLlSXPVxpOyHxGgPFA80F/ eS3tretQ+uprB1uw0VPjewMyzkJYKcWVuXTLa6KRyZfXVwCbd7U7nsDp Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/flicvideo: Check remaining bytes in FLI*COPY 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: IJM1tcaEYX0v Fixes: Timeout Fixes: 37795/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-4846536543043584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/flicvideo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 47ca77f62e0..e122fe231f5 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -735,6 +735,8 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, bytestream2_skip(&g2, chunk_size - 6); } else { + if (bytestream2_get_bytes_left(&g2) < 2 * s->avctx->width * s->avctx->height ) + return AVERROR_INVALIDDATA; for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height; y_ptr += s->frame->linesize[0]) {