From patchwork Sun Jun 16 23:08:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1606637vqg; Sun, 16 Jun 2024 16:09:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWQT/HAmWQuFqVGRyr6ktktQ5yVWvnu6PtN8ufkgmTklUFs9cbnA+BT9YpfkpL81abr+++0os+OMVWIoADdIDuM6OvGRM7WeRj61w== X-Google-Smtp-Source: AGHT+IF8q6ZLIHDQLva28sNvgw6KCdgvfQnEY+cLoj5lt+NIxKexZUA6mmPDw+3g+ONMKnKdm9I6 X-Received: by 2002:a2e:7818:0:b0:2ec:3ed:d71d with SMTP id 38308e7fff4ca-2ec03edd817mr33876271fa.5.1718579355431; Sun, 16 Jun 2024 16:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718579355; cv=none; d=google.com; s=arc-20160816; b=qp2S+0gPQLzHPvng/KmiGmwuFojnYvQS4wRaZ/j+V4Rjyalcf8jFyfRxyVX0WY57y6 RG4AnXQvl9EapYGj8lgJLqBkyVc7GLlNvvjLmiO0iEQt1RbyTwct0L2SexT5k81esfkG wFqeVTHaE+HJpyMzTOndj1Bxs+RU06/97zhWD+a8pzdvAbV+LwWGg61ADlIY7DZx2EtA ySGx0XNYHDtPWi29OiN2SwqKj+hE63ahqwABxY622TTJtzEo7mP6EIasP0ux9AmNWtt3 XjzyZf5nSywMh5Ve0P6n3OpM5pC2VgAydj3FSPnd/KYQaxO4ILbPOffhTGdDMbRf6LLU XlYg== 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=zXBoziaknKfQXI/9QIVX60xYrGUY939pZDQq0hsFavo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Xxhn/zyfe/wbOKvRHAXuqPDI8tcONWN3cdXKdAL08VVJN7Qnplr8itvKz8WQnjWtTK 6ZaR+Q2B8k6PzUaH0mDDu9mCVwqTJcu5V0vR7nBW37KssaQ2BA8gWqr/GXNUKG09CZMR 1VVhtzfx8bvRB3Bw9gYYlKeE1OlDTBNowd8ErjhJU/BaCglHxH8+jn0ZmvhW1/ciT87c QsIRTxgaPGmHdKZmnojYEuTiGIQ5+8hqql2PC93NE9biwKDNTJ1XogRzz2rC7HHyec+z ZTzrxAyug4YnZNpvcT5IT6krJWbXLJb68+OSX0DNkM4J14K8YD5m1m7OuKdpfKSAcM8l Tg1A==; 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=cdH9bRG+; 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-2ec17f10a7asi17615151fa.483.2024.06.16.16.09.14; Sun, 16 Jun 2024 16:09:15 -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=cdH9bRG+; 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 D758468D750; Mon, 17 Jun 2024 02:08:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7983D68D70E for ; Mon, 17 Jun 2024 02:08:36 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D7F57FF807 for ; Sun, 16 Jun 2024 23:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718579316; 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=CBrXUiK0VAcYaAgtkgLp+JuX9IbPGV0JK46Alo8W2gU=; b=cdH9bRG+2GQ9sekalIdH4CC7T7zuemrtMAbRO9T1j7gNF7zqcYrsC4AebOeMy525zKiTaO avQwTrtNqvUy1IKclUKxGEdubFCnW/apb/qW+LKRzBOaZrxCjDtW0DJFeRhtxwy4oC0Z2Z 179Qch/In41HoF8Le/GufQVG9FxFk3MHXFDJ/IQfUbGmIWdtMRvHxzlLG9SSAzKjUz0iPC NnwSdIKb4PB6zo5ewOH74QkzH4ZggizN7ur/jFzZaUqJjGodJxBEowr2AJvKqhC5iFZ/xz 0R4TEChtxtcrVxv9fn0oLoyA9UiRpgYFEtrSTEeSRTbdhBWrf8NaVRLcbTFBSg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jun 2024 01:08:26 +0200 Message-ID: <20240616230831.912377-4-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 4/9] avformat/iamf_parse: Layer, thou shalt not be 0 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: ZaKBRECGB9EX Fixes: out of array access Fixes: 68302/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4665793796177920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamf_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 5c2ff6862a7..12c2b9533a8 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -330,7 +330,7 @@ static int scalable_channel_layout_config(void *s, AVIOContext *pb, nb_layers = avio_r8(pb) >> 5; // get_bits(&gb, 3); // skip_bits(&gb, 5); //reserved - if (nb_layers > 6) + if (nb_layers > 6 || nb_layers == 0) return AVERROR_INVALIDDATA; audio_element->layers = av_calloc(nb_layers, sizeof(*audio_element->layers));