From patchwork Sun Sep 22 21:56:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2134833vqb; Sun, 22 Sep 2024 14:57:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgLEm1rdTTUq6NX3vWQ8r4kuzC7SbWzcJ9EcnOIn1BSkBvsQguFY3q1whZ9by8Wm+6LwCaVpr7yCGas/alY25b@gmail.com X-Google-Smtp-Source: AGHT+IHqsO8axFYAqamC84gLKkQsA0nWGxp/A+9kLbAMTNjXebxmZLOvAp/2ULZ8jM7UqPLjzi0p X-Received: by 2002:a05:6402:1ec1:b0:5c5:ae24:4616 with SMTP id 4fb4d7f45d1cf-5c5ae24471amr6297882a12.22.1727042266502; Sun, 22 Sep 2024 14:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727042266; cv=none; d=google.com; s=arc-20240605; b=MAN4PrUsCtdTf9kMvycaBkbqqAIatEZv26iegkyW9DwSyknjfMorNyaLSU7iSWaBON b127svYRYtYdodB34FCWiuqbgMcc61WPMc4rw5UkAvJVFtB7C7A9q/E+dy9D8DsV1O5E hK77MX3q+rosb2qOOVDawc9zHVDiFtDE+KpOVRX+EIIYvxqslKl1OerTyJQc70R4zkaj nTrFldWiVMUg9hg9AK4cTXFzXTWhBg24UMVW+ix+afS9WfEIWEa7x1o6Ugv08r+SGgOk yAJFZqFqz3UUT/V/GLE9dm7N3zi10bCfXQtfF3UiU3MFV0EJn1v81AVZURAFvfj2hY5i 0HFA== 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=i1MGYd59p+HaOxBeYvpapvKL51dojzl/d+yEBAcoACo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=fNZz9n5MZGToy1Z7dltCYmDdP+TyjwFoWGP3KDKFhUQV1uDRhfC9fnIiS3lQCY7X5g Hth8iqNNfvgcR2qj6UeaGYC+4dfkkthMopnFO9zORDVojFSwZjVK86Y2AMiz2OEoAvfH ghw2kWFncFBYKhOcr5uMP3RG5XV2jMG4vA4ruRysiUVICdGb0/CsnUwVpurFEO6LC05X EXEsOLW9V39gCWdYieJxM4fNkxWDgmMu6DZ5icj5/NQ6fOFdrKkAUj6Pe0triDYpbmcd +78bQORjHy890GxJropAKEZ8CjQQ+i7UKtbj7dwUa/YvplgHg9Kar0nR9p88Wzhn9ERK SClA==; 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=nLMWmAMT; 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-5c42bb5b3bfsi13106735a12.154.2024.09.22.14.57.45; Sun, 22 Sep 2024 14:57:46 -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=nLMWmAMT; 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 4B72B68DB43; Mon, 23 Sep 2024 00:57:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54CC368DB1B for ; Mon, 23 Sep 2024 00:56:52 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 96219C0002 for ; Sun, 22 Sep 2024 21:56:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727042211; 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=pSLUNT6rYcymcL3j+MAWLNVCQjriECspAC9IeGP9psU=; b=nLMWmAMTT0G5kJKuB7I96FZxG8mKCjZGbGS0eVv+tPIA7KV19LyW+vTeaZl/Vgr6PjCTiA fvkMX/h6RtKjksang8bXEhlwAxQWT6Ui6q+3t4oBHL+beOo66ewD6q/PlDNnpHpdERoyzb bqyTkGzJrqWTUSX317uh7YZ6YQs9uh2coVLkSNLDbPh5irXslaIHSc/Ie2KvZtEUNYvo42 MnV0kT7cd7fZ3JwMHsSSnU9/jNzH7sJCdjKTXeAQJvpbXNnR/0PTSMHfjcbrcUlWmBwjEK ho2IQpBRzmmNP2FMB1u3213pnqwtUwFGDwF80IcT4q11lbKFl992wPMJcx98fg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Sep 2024 23:56:41 +0200 Message-ID: <20240922215645.1182935-6-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 06/10] avcodec/imm4: Check input 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VLn9w1qH6p2s Fixes: Timeout Fixes: 71324/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5388489435185152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/imm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index a6da8fcf95b..573b6148339 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -453,6 +453,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (ret < 0) return ret; + if (((avctx->width + 15) / 16) * ((avctx->height + 15) / 16) > get_bits_left(gb)) + return AVERROR_INVALIDDATA; + + if ((ret = ff_get_buffer(avctx, frame, (frame->flags & AV_FRAME_FLAG_KEY) ? AV_GET_BUFFER_FLAG_REF : 0)) < 0) return ret;