From patchwork Mon Mar 25 03:29:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp955729pzb; Sun, 24 Mar 2024 20:29:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXc5fb5CfKVeCA73+KPdG19KN+Wv5X1b85A5w8U4xRo6UuPU4iPOByxLhUy3N8TMJ9leXzi9tWzl4/N+k5k+1/pE/GCf8ZfXSMgeA== X-Google-Smtp-Source: AGHT+IGbRDyl1vvNQWDMwMXkPcQuusLCczoX93iSOUqa4v8uGyBX2MrsNr35y6Bhe4jw51WBQFhh X-Received: by 2002:a17:906:249a:b0:a46:cef3:4aba with SMTP id e26-20020a170906249a00b00a46cef34abamr3371703ejb.75.1711337371362; Sun, 24 Mar 2024 20:29:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711337371; cv=none; d=google.com; s=arc-20160816; b=JS9swtD4EbCOkxE7VVxE6Uzdp/Pjwi73OnvZvptxcO6i3TbW/H/9KXkCYbHabBm19O bWnWVk5hGxeHGVg/XBkSGOVKXN7nG0m4HGBDSov4NNjlKs+mocMHszMiJfm2/LOOENzF AAnzxQwrO4gFz6G93A28gqheRBZ8jPbk4SK5VWeWLzSV93KxXdO6q1exwG3VMUptrvP1 xHeACxMyHOZdKov1ByywB5OrpZ2gD0sIw3lvCxtmeqv2tNYR2qLrsI2t1jGzfk1RHE46 51pP6HAie6IXF2uq5bR55SJy0ZQLNWNj1GJiPTBueEdz7qy+M9KlFXlHiDGpsYwxsyoB JJdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=cvoQdsJfVp+Ea+QejB+Nyf+FISZvX3IVfdNRotJKbgk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=l77IF8F+ISgpcqyyvjVCvDbIDsLh/5+hA4MoDNzxRAbJGwzHwdgABMqY327lHUA69A bNsrObgsK7awaSF54kfWNjGZKzpVRol4SW2znDWq0aHXh8dEFSCTT/7OG7bu0RYvsmcq axmtrMygePQVB1pP4HcnBQN34Ee8ziPmR80q/L9Bn0awiJvAw+PSWWdm6xvDjZtq0hwG AhmzpzsO6SRDITe1Brtk+qUPNiwv+DHkkZtdvjGVsE3NnALgtCh5rMneS807vzKZUaP8 tA4Cgzd9j+3QdEasaPftTmYYimyhse5dCMSCZ3HrllCrJ1oXPx/jyi7idvAGLCol16xF POrg==; 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=GSSSwoc1; 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 m3-20020a170906720300b00a46b9fdb7a4si2189029ejk.296.2024.03.24.20.29.31; Sun, 24 Mar 2024 20:29:31 -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=GSSSwoc1; 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 7275A68D44C; Mon, 25 Mar 2024 05:29:18 +0200 (EET) 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 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /THOkHUiaUAq 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);