From patchwork Wed Mar 20 02:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47258 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8ba5:b0:1a3:31a3:7958 with SMTP id m37csp122749pzh; Tue, 19 Mar 2024 19:19:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7YxexDMCycvhGUKEeKvWeu0SnJOiUtdDlYQyIW/WLN/JxC0S2Byr9YyHvPkRbcyAmo9lc03DUOaYkV6eMG+2m0up5nwf6xx6aVw== X-Google-Smtp-Source: AGHT+IF1vIRfPO83g+xdEgmXcIN0P3Ru5f8cTMG9LV8jYB7atthJZuzhhnpJTpXNK71Z3n0fy+re X-Received: by 2002:a17:906:2c19:b0:a46:bdfe:225b with SMTP id e25-20020a1709062c1900b00a46bdfe225bmr914222ejh.11.1710901189654; Tue, 19 Mar 2024 19:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710901189; cv=none; d=google.com; s=arc-20160816; b=BxufOpDYlugYdrG7MFTgTEBc0FRKy8xMAwAq5kVILARg1ElQFqz9/lrLd+4RqDPifZ Gydb8ygYO7M4Q/lyB/XSE0n2qIGMNmr3Dg9L6Hk/GEeaQHssyMsag2x++w8Am//NzbAL AagDy+RtgopZKxQzvArg89cTiYeMzEmL3FuQrmNaK/jqg9By9gjvJyoA8PU6DZk7M5eb O7ZcHpTM8UEQrBpe8FnoRvy/GCQfkvRmpbTR2zxcUWgeQpMJWhKMpqISDwYDS3M7Oi93 4kVEKVALSTDtB4rSoNq3oG6XQYz5ZNs8ipIh0X/joJ2d2ado/PiDrq5fBFL16Xb3hQ6B Y1AA== 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=0cphLiI39JY5sDmTpxo1G5Un+fR/LAvfwTj5WtmVu+o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Mj1N3ABmIlREH4bRFQmC0WfdYgBcsh5xp1xwHdgyZdPoV1GglTNhdLy3DdqnIovGJh kfu77qgBx07Pg8gV0+Lj4ohszbLcuxi0gk9bxVDQKvArO4XcyzEdVcgjYeHbHJdAm+7w MKzpHh6Z8psTMpVMgkCgP7h7/nqL2QgytG9sjOARUmDSUvzYIvYz21UYIgHe4aHL+RTN ZIq8QwVtyDZyrACVh5fhDaaU6h6hH6JcvaQNu3zBKLaR366ccFu1E6ktNxJIu77/R0Qs Vfrq4zIn91L4Fo1w3Wiro1Bv1HAz5/Ju77ssQ2A2VhozXaedORBGVoLNdl4QWuFzs1UH Qrvw==; 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=MJ78Hk8O; 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 w23-20020a170906185700b00a46c4ff84f8si2191897eje.972.2024.03.19.19.19.49; Tue, 19 Mar 2024 19:19:49 -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=MJ78Hk8O; 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 DAF4F68D4BD; Wed, 20 Mar 2024 04:19:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0910A68D3FC for ; Wed, 20 Mar 2024 04:19:28 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3B8F340003 for ; Wed, 20 Mar 2024 02:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710901168; 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=5SVshkR0/NqBiezynFLwr1qgIo2msQYnibEWTIvlwe0=; b=MJ78Hk8OOdB8Fhq5QxFvu6Hna5nbDVw6eBauahJKeM4mQhZu831VGXyhbBpJPHqg7bIqGd yiwiTzDPCWQn+8EDAjwQFcGPojVxtDTdR0BucRxqlKL0Da/rAR+7SdE36a5fl0fQw/icWx azyVWtF64Pv1jTDjEG0oyDALt33TiEsmHdMw0PoX98GE15rCd1hVxbHaVmfm4dFZj/Xmsj dlGE+/af+y7GHwSIVAXg6cjTpvLQP87QBD38GhpJG1biGvtXFugfxd7NyIyNwQ5qxybSC5 EAdIQLvXcx7zErvXtEVQq3PyJViaADJqzEVJM8OZWUm3jpHQzaz5LTLp3DSnyQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 03:19:25 +0100 Message-Id: <20240320021926.3759-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240320021926.3759-1-michael@niedermayer.cc> References: <20240320021926.3759-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: Check sample_count and auxiliary_info_default_size to 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: srWwBNCdRuLl This combination causes 0 size arrays to be allocated and to leak later Fixes: memleak Fixes: 64342/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4520993686945792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8d1135270c..f954b924a0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6994,6 +6994,9 @@ static int mov_read_saiz(MOVContext *c, AVIOContext *pb, MOVAtom atom) sample_count = avio_rb32(pb); if (encryption_index->auxiliary_info_default_size == 0) { + if (sample_count == 0) + return AVERROR_INVALIDDATA; + encryption_index->auxiliary_info_sizes = av_malloc(sample_count); if (!encryption_index->auxiliary_info_sizes) return AVERROR(ENOMEM);