From patchwork Sun Sep 22 21:56:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2138738vqb; Sun, 22 Sep 2024 15:09:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsWizoyg0n6YGKh4fga3Ap/3zQ3larZMHSCnkykmj58QU50FQk9+QWyApJNyFgEKxjnax7YZlqwSIlEkXXKUsS@gmail.com X-Google-Smtp-Source: AGHT+IFkA0KT6G4iyLSzCs9Gn7Kr20awbrpwqzlGHrvv9/bs7X+xUqiN7Qx3tzSSk1To0ZHLlG/O X-Received: by 2002:a05:6402:35d3:b0:5c3:eb29:5be0 with SMTP id 4fb4d7f45d1cf-5c464a7d338mr3428468a12.7.1727042956285; Sun, 22 Sep 2024 15:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727042956; cv=none; d=google.com; s=arc-20240605; b=V4LGSUcxLhzVZmnqSIHiPfJdzeJkGaxvPF5yiX9TFoTm/eRgsMHEAKsFZmkORtt8Ij QrpI039T/wUSNmP8ZRb4kaslTQAroziNwlh+RkwTyjdM2IWgrv5JM9GPuytBeYrhnLQZ ch1wOpU7uJJKuW48bAMWwu7Y5LOrjdu42pd0H2cQGOgKHcvDG5KZAkjfrvpi+vdngaIs HUV4KSyDTFiCtS8pjRiyoIENaym+FH2nOBmQQLNmBeBFI/e2RGpbp00I8nwSJx5Qx/jM ueof5v+omgLIcBLBpJHjlLuKrIkDxzzsM+OhryvcEHqZLjwENlJhrg3eseia+7QSxv8V /tCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=vnTW2KD6nzAAACj8tQrwyuld1EA172g8OfAmV/vx/KQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=GkZLiDXGvtlYTpSoTaFcLBhTkysl/gm1A+BsccMkvHLwtn9/jaaKFFai4Ies/XbsKW dk7DrrGfVL2Zig3MFZIQSRf08pj+Wh+HimMMSX6YvhfdiC12qLI9+5WxLFMzZBaq+JOY Z3UQBYIZ/lSZE/TJNpyYjwlfq310CLAOrUgPtSSjvnLXmm6CDINegkSdKz1XnIWtvjHc MmMzDovMVzkAG/FIfCrF1ChWw4MGRM8v0nHAnvQC0V+vyxy5TQtsDKLiJW+GjpZFQnWo BKEUVV9vM/9L4fO74a6Vy7xm8cglIeTwymqIqzTf/CiOv3coZLkG+esyu8vJbgLjJBPp NcEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=obLu8t6X; 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 4fb4d7f45d1cf-5c445061f08si9557855a12.633.2024.09.22.15.09.15; Sun, 22 Sep 2024 15:09:16 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=obLu8t6X; 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 9C0F368DBB5; Mon, 23 Sep 2024 00:57:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF9D768DB71 for ; Mon, 23 Sep 2024 00:56:52 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 59E9F60004 for ; Sun, 22 Sep 2024 21:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727042212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PUEuI/YhQPNiZavtXeAvU7g4xoTFhFN60XRaKUJ2pIw=; b=obLu8t6XA35wOm9hJaUXyv4MZexeeWcHZSMyvILek/oYii2v3we/ZUycBwTbcne9O28s9s WxiLEcF6wCEoPZltnfqFALS1eDOSKj54ylDZyFQ24QMtqq2mwaHPnniY87QuFo11I7wOSw QYVkr92HZ8G6J2AMhv7re07jumuYM1hblzRaKWvzNsZGRcmjMMKGDoPatLWW3e1SvJL5t/ devGA4H4DRnBm9dmKU4mIPCQ8wcNKYokxnYhFY2GYDAJJmDW5o6qw/sHwWPCkfXkYXLH/e JeNnULLqCUM5SM86WypfBdimn4QtWY9b+Hhaz+AowXwiYk1xc//oZe86iEz+cg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Sep 2024 23:56:42 +0200 Message-ID: <20240922215645.1182935-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240922215645.1182935-1-michael@niedermayer.cc> References: <20240922215645.1182935-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 07/10] avcodec/sgirl edec: Check input length 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fe0zhhFVUff+ Fixes: Timeout Fixes: 71712/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SGIRLE_fuzzer-5763700835811328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/sgirledec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index 3ce72eccb86..3bd31b73470 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -115,6 +115,9 @@ static int sgirle_decode_frame(AVCodecContext *avctx, AVFrame *frame, { int ret; + if (avpkt->size * 192ll / 2 < avctx->width * avctx->height) + return AVERROR_INVALIDDATA; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret;