From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D073848D12 for ; Mon, 25 Mar 2024 03:29:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C49968D44A; Mon, 25 Mar 2024 05:29:18 +0200 (EET) 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 7A3F468D33C for ; Mon, 25 Mar 2024 05:29:10 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id A84D4C0003 for ; Mon, 25 Mar 2024 03:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711337349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=w8Z6xUSDJr0wDjk3XsjF7ce7ttWr5twFHkD/1fdy/2o=; b=GSSSwoc1UEeflY56I5Xf7+AA4gtkK+cZz9OjYC4fShmp5sxpYe7lYGYWxjUgTw/lTdtAtA Z3Ppbu53k5Jz157yJ5bHpyBfRdd4IhGK8AhfX/5inNK3yEZN4x4NSFlX9nc/1IeCtVEFmt cxFrYpmi3DmIrfxnWuijX34rW4OaDiKYacmicMhaZ0BRUBbNx4ym0sSQd12mBv5VdgP4/A en99fsPOG499/z1AWaB934vVipUaOP27CmWi0A3LD6QIXzAtJoA3zytfDz5VzqAVBjM89m SnjujCFeekDaJnD/DLO5BXVv0t2U7mUaZZCVmH6/iys2r9WUEfvYDtmhXpYzEA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 25 Mar 2024 04:29:08 +0100 Message-Id: <20240325032908.11939-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240325032908.11939-1-michael@niedermayer.cc> References: <20240325032908.11939-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avformat/iamf_reader: Check len before summing 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 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: integer overflow Fixes: 67275/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-5438920751906816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamf_reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/iamf_reader.c b/libavformat/iamf_reader.c index 270cfac389..f3ff4170c6 100644 --- a/libavformat/iamf_reader.c +++ b/libavformat/iamf_reader.c @@ -283,9 +283,9 @@ int ff_iamf_read_packet(AVFormatContext *s, IAMFDemuxContext *c, len = ff_iamf_parse_obu_header(header, size, &obu_size, &start_pos, &type, &skip_samples, &discard_padding); - if (len < 0 || obu_size > max_size) { + if (len < 0 || obu_size > max_size || len > INT_MAX - read) { av_log(s, AV_LOG_ERROR, "Failed to read obu\n"); - return len; + return len < 0 ? len : AVERROR_INVALIDDATA; } avio_seek(pb, -(size - start_pos), SEEK_CUR); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".