From patchwork Sun Sep 22 21:56:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51708 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2134765vqb; Sun, 22 Sep 2024 14:57:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDaLy0QfjTw9/qsrgNKDswMnWR0NIlXT1aiMkuMEqIBLVod796w8rigGkDJlfuMaH0jfTgnJothS9WJUy0Vml6@gmail.com X-Google-Smtp-Source: AGHT+IHRomwPvZ2TzInuKdnAFPSXwVmkclq2xdDTO81cguC4VqeCMEidK6DE4IyZXZI7+LWznsQm X-Received: by 2002:a05:651c:2228:b0:2ef:2ce0:6ac with SMTP id 38308e7fff4ca-2f7cc37560dmr43058811fa.22.1727042247349; Sun, 22 Sep 2024 14:57:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727042247; cv=none; d=google.com; s=arc-20240605; b=DwIuQtwuHYy0gf8XdqmkeYZIncGGG/9jJLkpQzfJX37456UMxLImlzz3/ko1jUoE7N CUHQWVQNQTePzjapwv9oG1/48wbRlMc7M2XL77V+y+FEOud312ZI4e1emVvSP45CWn+b /v+WV0N3nFyQjpHhwKPl2bW6bzgk4R50jKRj45DjtnQzGzd30rIn0jTA22gqJG31j7td 2vgL0myBeqkqB/3wweeNUPbfMMD6c0R8l7tBy0yZg6iZr6lBf9+fo+YbkpmHYG6HyleS omrP+2vCCjFFprVlFPaMO+vYKyqZq5vNrU7e20uJJeAkXX/p0b0KhiAnYN5GJ9sBaeQJ LLdA== 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=sobIwL0/sOy93pBdIXf+0Fp0jm1e6zaBfGLADb6VUN4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eBpBP3HVM684eO18AlKKV7oEYwQJSEX7JheX3ldao+cJC+jb/YBONmcKgq14398ROV Mwk/nY+kL2/VydMkcLDKY/qwdPFNh1mNo/8sW9sW5ZWfk2k2flhhp/XA5YogGlm0Lq3M DXaVuP3fcfmN7zNPoRppeh886+3+L6Zv2pbMlR8txdOT671kMZqRnnOOu7DT9/YjTn3s 1NzV7Kf4DAiKKzNhLNc/XDZ7cezY/EgnnrM6PtM9Wq29a+MHkILkWfSLSPLAy6VEFKtU fT3+rVCf6z1BFUv8v8OfQIhYFlR3Rk/O4LTWu2RUyHNH0487UvY5PhBTVC6R9fAdZXij FuDw==; 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=lECBo16+; 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 38308e7fff4ca-2f79d35e645si52696861fa.252.2024.09.22.14.57.26; Sun, 22 Sep 2024 14:57:27 -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=lECBo16+; 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 8C78868DB68; Mon, 23 Sep 2024 00:56:57 +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 3DEC568DAF3 for ; Mon, 23 Sep 2024 00:56:50 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8EA4F60002 for ; Sun, 22 Sep 2024 21:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727042209; 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=7/MbdiebyADe6XfR6unSldP0yV+z7Y8iRww7ToxFMRE=; b=lECBo16+AAQ9uRpTvaCp0ZNnrosRYoV2m40ynLiYRzPaDJpaElJqgVSQiCX7MCa7Ywz1M5 iLbhfCcFgQzaErqoBxVZYrh4MOCOzbVwD10nDmoSuTQkXzaBtAWAl49djSXLaMaATPSfx0 FWAn4WHEn5vvuoHIEl7CFsAUJqSYYU7nshpf75tpbQlFohhXGxs0Nzg/EUzUOiLCNdo3pN Nhp7LIZ7JoKefm4u4Vt2V20j+Rrvt2DM060JQJnknbi71TmgQRFFYNPSWSCYCTaGlQNMIq v+CckCPpoM54DWoUiflm3HZ3jKeP1wwiKPSpvLLvReEgFOULh5WrGkyqY6Gz4g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Sep 2024 23:56:39 +0200 Message-ID: <20240922215645.1182935-4-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 04/10] avcodec/svq3: Check for minimum size input 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: Jpav395DjC4p Fixes: Timeout Fixes: 71295/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SVQ3_fuzzer-4999941125111808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/svq3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index ce4c58e14fb..f730358e2f9 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1400,6 +1400,9 @@ static int svq3_decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (svq3_decode_slice_header(avctx)) return -1; + if (avpkt->size < s->mb_width * s->mb_height / 8) + return AVERROR_INVALIDDATA; + s->pict_type = s->slice_type; if (s->pict_type != AV_PICTURE_TYPE_B)