From patchwork Sun Jun 16 23:08:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1606511vqg; Sun, 16 Jun 2024 16:08:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmiRv2ypdIEhzDi8Ay+QW0qg+cJMtOIcg1gVwi8YayBpZYHq2AMHwuUPC2GxeBb6IkO29huEoRCigQCLKAvB0W+rDPrgf+zIwAaQ== X-Google-Smtp-Source: AGHT+IFV31eafDmVx+uNIPyxN8o4lYQgS4uCB4ESbofQiXTID27Y11nbVWtmiHl73oKSB/tnJlW0 X-Received: by 2002:a17:907:c283:b0:a6f:815f:16d8 with SMTP id a640c23a62f3a-a6f815f17ccmr163003366b.7.1718579335894; Sun, 16 Jun 2024 16:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718579335; cv=none; d=google.com; s=arc-20160816; b=Xex+PTn1fs8ti8oSN4qrAIlaUH2KdReOMJ+5LFA+z1h90d68aO1Guxg8Q9Qgbgxscy Rq+ACEINqROownToEu9AfgCPMx11SgSjm1ZMfLQYz523Mkh3z/pHqz5ktOXgxAx2oexL KHvnSz8xAyYcqnEuSQwzcFCIqXVKNyMMM+4uiuYmzgEC9yw7OhLa5qBCQFxOy2nhGcdZ xNwh6alcBTDBtGlhMP0VNXGOau7I9KG/Xm9qK77Teq9CkuyOA+nV1xY0dnuVLQvxh6nx I3vmuDMQjRJrECr0cYJDrZ4watEuMoobn9/iK6XnAkfHdBhr6rTX+McgIdluvWu36TR8 fzlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=95brhBlxb3CCFNLgjdsUyRGt9ugGLb/1Pyn4cyDgtE8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=W/vlKlZDLL6Nd0oXGjJRf9OSIHjxl2I/o6GUpN/4uqWijKF928U1M1vrFzkww9Jt46 kA22KZWXdjtq1Ji5ZVYJgawTqvjux3ERSfPhj+/dljwe1AND0mq67Z9p/2G3Mm5YXciE yL2R9V+PQfsQoHextjRQJzSBaYp0jb0yWKmFdtLcDQ3UeYo/5C5dkJCFXkInCYf4NjqJ lNnE53FytQaN2G1FtWGBNzcruxY7wbgfa8FGfQR8ZFxu4KVRBnSsOK214hsr9I4xK/i5 QJxeqpP5hKOt0me/3nouXwUvsUOCUM+OlDeg6i2ut8yUlInMoE0//kMGezG6ggpyYg6O Ydog==; 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=HHntTaxy; 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 a640c23a62f3a-a6f5f1d4ed9si336011366b.1007.2024.06.16.16.08.55; Sun, 16 Jun 2024 16:08:55 -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=HHntTaxy; 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 550F268D74A; Mon, 17 Jun 2024 02:08:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A933268D72A for ; Mon, 17 Jun 2024 02:08:35 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3861D1C0003 for ; Sun, 16 Jun 2024 23:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718579314; 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=+Zzr8M20JaTkZCamdJt5FZ7AB0t3DoBef6fivtyHVz0=; b=HHntTaxyE7vuw13ipbt/8k3U/QHBWMfJwAWx7/tY1T87m0aZmVJfFkzdYsEV6SZI6ulHgB tSKKghF813tHjtel23VE0agXe0WLc/pe1qOEjLoRkTNlZ899UAfnXyyj3dtEYAQWiAXy/w 9wwW4tpr7ct2aWSevUUUt5775pCp7JZGFBngMY4dnqF0ttmPCSrLMnJk8JGZPhfq4VuT+C zYFy6tR+UsKiLRHaA6LqVe+rsMf+F7eRxXdY16kCWGzqxhG9+OPfRCL9Pumm+39MsDL4NR ij8d5JXFhUiBGo3sNFLiRAqfCQIAz/wplldbd0IfaOu8JaJZjVxBeInNnRIVhg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jun 2024 01:08:24 +0200 Message-ID: <20240616230831.912377-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240616230831.912377-1-michael@niedermayer.cc> References: <20240616230831.912377-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/mpeg4audio: Check that there is enough space for the first 3 elements in ff_mpeg4audio_get_config_gb() 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: VQ4FTJONsaO+ Fixes: out of array access Fixes: 68863/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-4833546039525376 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4audio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index fbd2a8f811a..ae18944f0d5 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -94,6 +94,10 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, { int specific_config_bitindex, ret; int start_bit_index = get_bits_count(gb); + + if (get_bits_left(gb) < 5+4+4) + return AVERROR_INVALIDDATA; + c->object_type = get_object_type(gb); c->sample_rate = get_sample_rate(gb, &c->sampling_index); c->chan_config = get_bits(gb, 4);