From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id EE68048472 for ; Fri, 26 Dec 2025 23:41:57 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'v8TUhFpJdzcUN3OXfTqPiNf5kfFwi+Mi2E+kRvlyDMo=', expected b'M/tf2EQQaFZtbO5rrEoB7+tvL/5UdOaD8CvOt57s/GI=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766792507; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=v8TUhFpJdzcUN3OXfTqPiNf5kfFwi+Mi2E+kRvlyDMo=; b=rB3VBVSs6scsNfJQjzdMVhBjQdVf2J5Gvkt6j2mIdVaNQ6TjFuAI3c11TD8oH0WtVDyUs 8DqoL4e8mT91UnFFz8nYzuXz5+c8rXIe6D+3mf4iKz/gsnt/cc5zJFZPzF0Uik6u71MwOfq 0bU9MSwhOG6hHfz51vbWfSqqug6+tTnbbVZMN+682FybFoPKfE5P9ag+BqQgDG9SB72f75y NSUuzdMr2cQbypmgCq1ylFdMEfJd+mHcS0fK37tZkK9h1BplQjsH0pk02QzUxZz1f0MYTrM iFsLDX73jhDIS/gqCekYxYFTh0GoJ9rDEKG8/m7lcyEERIbkMbDBLjOqMPAQ== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 887C2690B79; Sat, 27 Dec 2025 01:41:47 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766792492; b=qumUhDa49b8QY96D2h2zGKrgHp6GDmBMxiPqqRE8XSdiBusjqqiutI2yqEVJKD/9Lz/zt gRSFvow5zynzLtdJFs0vn0hjDx6OYHWp6V7XovMd2gp3dlk7EXsuvPK8/GdfDzOXzNsTMZp 5AHO+fH+qQFLmh6VOCzwHkrVS12YTjI5LgUmQFozZ/24LKk8bM3Gqy2X6pFd7Hals4ZxCqI ASJLo5b/qmkDXwf+vLFQyY8rEGvnJWVQOBldhFzDOpK2c2czoNPiaJTPNimuMtnAjetlMpZ AcBgdZBXj4oPhEnRw9rTYLJLNOMhHvxiw7aHMtE+RzJEwpfZNXVY1ANE1DVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766792492; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=Zh6sjISnDKt0Zx7l6NFwp1Y012AMcmSTvMQXV44zMqI=; b=K67aKKEsIqhhqvSXLd9kXU+7CpjD6ED8W3GC5h0Iw3JTcMcm9GFeZvZzjvojWR5vvaOrg 4/m0sigG+hFzlEJDkFvfk4OWPzVZssiv/SC0gdFFGI+yIWkGrCXUUSbIZUYyxBsL4ICi+ad K8TN0gppARsfzE1wBvhoiHUiefsarNS3LZYLIKMfziWvJYyfRuM/QD6iV98pcTdwFpvAS6F 7shuKOMnNPPT3f/UvXMoLNFxvki+YsbOhD0nMf4fZxqjJC2OTsnaAaFszYI42rNV40ROJ7M /SWoGR61a6BdEs/HPKRnuxLHaU+qHf/1ECq3QD62FPLS1kB7sw47Rb7AS1Hg== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766792483; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=M/tf2EQQaFZtbO5rrEoB7+tvL/5UdOaD8CvOt57s/GI=; b=4qDCarfeszba1rK/OPx65ddeTLppCVPNsBK4Hw2fhMqCgCa9iq95APo6mRoCamZ13GNvc FQBynbO8aQZK3w0Krwf8V8kD1B5O/UMhAVmrWfSRPz1KrZ4de6Al6UuSWimNVb4Dn+v0h29 HjY+XOGqRengWlqnE+RM8oMujvjO+UvmIgxuf1ij+ggrxfwHDl8lojXTjMJonPmyNWmfhe0 xLekl4uX6JsuJilHEwXhr47Hl+M5P5uYdJ3JDvqiQDpez5NwrrBCm2r8c43qqQlJgEYrAWS 9bPNUbghnuUj+T5NI3HHAXkU+wiRxclsSdhgZ+LCJgkjIPQDC/7yYlWomEig== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CB910690B5B for ; Sat, 27 Dec 2025 01:41:23 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Dec 2025 23:41:23 -0000 Message-ID: <176679248399.25.1695863829113756243@4457048688e7> Message-ID-Hash: MIVCN373NRPQYPYU3RUITRFMUQRS6AB4 X-Message-ID-Hash: MIVCN373NRPQYPYU3RUITRFMUQRS6AB4 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/iamf_parse: check layer channel count and stream count for consistency (PR #21300) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21300 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21300 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21300.patch A layer could define a loudspeaker_layout that corresponds to a certain channel layout, but then report an amount of substream_count and coupled_substream_count that might not match the expected channel count. Fixes: Invalid write of size 4 Fixes: clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-6687125346254848 >>From 0dd2c3a7ff3bba3154e64b9dacd12be3fc8432f9 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 26 Dec 2025 20:37:19 -0300 Subject: [PATCH] avformat/iamf_parse: check layer channel count and stream count for consistency A layer could define a loudspeaker_layout that corresponds to a certain channel layout, but then report an amount of substream_count and coupled_substream_count that might not match the expected channel count. Fixes: Invalid write of size 4 Fixes: clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-6687125346254848 Signed-off-by: James Almer --- libavformat/iamf_parse.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 57ed89e74d..b9f24c0d6a 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -406,6 +406,7 @@ static int scalable_channel_layout_config(void *s, AVIOContext *pb, int substream_count, coupled_substream_count; int expanded_loudspeaker_layout = -1; int ret, byte = avio_r8(pb); + int channels; layer = av_iamf_audio_element_add_layer(audio_element->element); if (!layer) @@ -455,7 +456,13 @@ static int scalable_channel_layout_config(void *s, AVIOContext *pb, .nb_channels = substream_count + coupled_substream_count }; - if (i && ch_layout.nb_channels <= audio_element->element->layers[i-1]->ch_layout.nb_channels) + channels = ch_layout.nb_channels; + if (i) { + if (ch_layout.nb_channels <= audio_element->element->layers[i-1]->ch_layout.nb_channels) + return AVERROR_INVALIDDATA; + channels -= audio_element->element->layers[i-1]->ch_layout.nb_channels; + } + if (channels != substream_count + coupled_substream_count) return AVERROR_INVALIDDATA; for (int j = 0; j < substream_count; j++) { -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org