From patchwork Sun Feb 27 10:26:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34536 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1761226nkx; Sun, 27 Feb 2022 02:26:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8KDeyJWuUJkXeO9HXJM6HjCI1Pg1uypC5/nsiT5X2esrtATj2SJh/6kp2CbTuppIXTmPN X-Received: by 2002:a17:906:f6d9:b0:6ce:e7d:5f3a with SMTP id jo25-20020a170906f6d900b006ce0e7d5f3amr11471227ejb.20.1645957594765; Sun, 27 Feb 2022 02:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645957594; cv=none; d=google.com; s=arc-20160816; b=C9jdpGSag4cTVm0A8hADhzezpQqchGs3iXVc3zu+bW8T0qTXRUvaUFieb0CXqLBMRK ky5idrfHgPhxuMi+Nbk/5/bIQDru2DchljZtQXCDIsOvDXsdYD48sbAGVHY2dfzIT1kK ZybJcMX/Ux6BgGpTWfGI2uKEmtUTkKEKZ5ommMo3Xn5U0f3m4yw6iaCDU8b+lkVjDb/Y 94avwNj8QL3UbeySjfBmJ9i7R4r1jxTYWUwkmJ778eOiyPGiQf6Cy2stPkfxN1ukCZh2 ygcLrpOtlcT45eriKmOjQqIuYDH2K1XWxfMW3LPmTh2yqrOgjAvTNUM5UjNaqhiJ4imH 0IuA== 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=3RRJzGbZW5IcQC3aFjnpPT0WzpprK2k147SIki8gnj4=; b=UdAMwRiGNMzw2bopX24nRQeQ5EsZXCV86r+7bvLZxWhbziuFbhFCsdxzuWmHLmqqp2 whwCM8WYFPUClmqAY67erQNkT47uFQqw5+kLHnn85W5T9QHrdyHWjlDSmeYcZ7B+2W+6 dQRg6TvT2nQQVflNOSUDQQMLCDiz5hAQ6IfMUPmZ0GxQbuz7uiiqtOftyX8wmRP+d3Ya YI78Ai8d/PXnJFowbdH3Rr4JU22CjVmcas1w+TTgy19AvQxSN1Q1se4Cyc7r+qZPH4Xl SgHaIp/91SZinyHwJHrEUAKc9owlmbLTeT6LUhocnkMRzT4ZP36yMugvUMpmul9tFMZi lOMw== 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 fy1-20020a1709069f0100b006b293cd4ee3si5201451ejc.260.2022.02.27.02.26.33; Sun, 27 Feb 2022 02:26:34 -0800 (PST) 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 4C51868AFE1; Sun, 27 Feb 2022 12:26:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (vie01a-dmta-at01-2.mx.upcmail.net [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA72168A7E9 for ; Sun, 27 Feb 2022 12:26:22 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nOGkv-0044Ru-DO for ffmpeg-devel@ffmpeg.org; Sun, 27 Feb 2022 11:26:21 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id OGkvnQITVSgGFOGkvnyXPc; Sun, 27 Feb 2022 11:26:21 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id OGkgn8XXtOPqFOGkgnz4pl; Sun, 27 Feb 2022 11:26:06 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=621b51cc a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=fDVe4QxoxG0HAJXDuVYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Feb 2022 11:26:06 +0100 Message-Id: <20220227102606.5717-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCYnXsjzLTnNjlDF1MAfrovHznz2xZhuF1G4e6B+AwwX900QklPwenpBGSJ2OcrGYkTp4J/VDq8XaOm3+68UyxT5IiGsnPA7EIkQU23inh3ILF8zZTce 7+BS9Hxt0o2NtRdXOM7v8GqUMaKoARdjzAGDt7eD76v/BiGydAqDXt1WmxAPEImOU7tFUpu1emF8ZA== Subject: [FFmpeg-devel] [PATCH] avcodec/argo: Check packet size 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: 0bya9nbuG5He Fixes: Timeout Fixes: 45052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-6033489206575104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/argo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 66f3d96480..58cc9984bc 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -607,6 +607,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, uint32_t chunk; int ret; + if (avpkt->size < 4) + return AVERROR_INVALIDDATA; + bytestream2_init(gb, avpkt->data, avpkt->size); if ((ret = ff_reget_buffer(avctx, frame, 0)) < 0)