From patchwork Tue Mar 26 00:11:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1510459pzb; Mon, 25 Mar 2024 17:12:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGyX8HsFz/xEmoyaIg86C9WED3vBMSP/r74SHcEeV3ZPqxOXyyUbw9xbtKkD8094C7sFZnBd+S42bs5YLZRzC0JHnoCsCMJsgQow== X-Google-Smtp-Source: AGHT+IGQYBTMLUToqXmrhg6jDz2FxXHy1nuD/yUoHOAewNXE5ZvkuDK6OioEev5mumU6tDC8Hl9M X-Received: by 2002:a17:906:b789:b0:a46:f9a0:748 with SMTP id dt9-20020a170906b78900b00a46f9a00748mr5429923ejb.5.1711411923814; Mon, 25 Mar 2024 17:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711411923; cv=none; d=google.com; s=arc-20160816; b=pCCtopcVQgm8vIMtSNGqLxcoqJ3zRynTmKqnO//RA26pxKXSwAABPS4DrD/z816Yv+ 5oMBqfHQDVXg7D7SWvDuRTPKlo7KG6aKwyzDN3b3QVL6Yn3ehUN6rMbs/5jBPOvNZVfB x9I+hWt9coPBxzQ//3FIcV7Ig6w/G4JHarfoEii8yBu9rDPwL5CtqJMSBcbWF3JfTLdw iWiHzWDL9uSJMJCIi6YQon57c49M1ShFzDPnASbZizk6gLKPsgIESK6NxZ8h/dpFKGf2 ngSg0nRNMxN1FjyM+rtCmLw8CTiKhxMMiyhIjiozzlBBmeiG6lNmeMYEmIgFKekKVxTN gdtg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=SPvw4gIuRR2RRnlmX2UYo6zkHUQd/V0mBdZt+/oykUE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=m+Jmmoq36hKovl9kQVa3pMMES0Rgx5dVV/U8TfBlzY31iwZmkCDd8OVjj/z9ji7xQi SFiAhlineUT6Ha1hJ19Zk5chWrnco7CCwRm5MH7NsmKfocNYa/LHfJgKiUhZpsVUO84H 2WQqeAPhbVhYBydWY6XuQLMmGaMeu/POCj9l2I4kExt0yWkMWeH+SFr6E07BVYB4Ofb6 wMZk2Q/Ak9XPWZpeWslbmizPwXqAUJ67OknvCYpAO+OBIhTqOw5Y4OMxMrooTmmuSgnd TkAVdZlI5zXlviLm9hLTgwNTtyxh9yaEyHxXM0+XmmZMZk18Gmz0aVT0Z+fc+VsD5fUK GP3A==; 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=BTDWLFa8; 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 x23-20020a1709065ad700b00a4749f4632dsi2345774ejs.43.2024.03.25.17.12.03; Mon, 25 Mar 2024 17:12:03 -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=BTDWLFa8; 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 9136168D5DB; Tue, 26 Mar 2024 02:11:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF7E768D463 for ; Tue, 26 Mar 2024 02:11:52 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 39F43E0002 for ; Tue, 26 Mar 2024 00:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711411912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=lK8fEFv11poqFO3gpQZxdGLGSoBoaIEAcaI8d62mRSU=; b=BTDWLFa8/m+ZCY8Y8YloifOL0oY0t+6bpgKkxZDX3GkbRQF6CYjAEHgqxZjcX9ZOJqu6Cl gxrRSd/jIJ6T8420PytbA+akm/S1W0sLU6ONn/ouPvP1vshxX+s02OHPeWSgU21kXM4xI7 SF9htYjRhLewLNj70dhv9i2skkLo4v3Sl0NqUx0ALq8iRhlRmRAl+h11MKJHUDKkE6LIFY FQO4LssOHsc1kE2lvt9Hk7OAOm67KNdEp0RrolMMHbhRQI8kDBKpAv91VqdkEh0fuJuUvy dHOP/4vS5+e8lquvwHZJKXUwHY4UXvgxHeO+7y2uS7zzIi9q+1F21z4WevTEjQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 01:11:42 +0100 Message-Id: <20240326001151.12083-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/10] avformat/concatdec: Check user_duration sum 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: 2EROEiL+UCx2 Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-6434245599690752 Fixes: signed integer overflow: 9223372026773000000 + 22337000000 cannot be represented in type 'long' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/concatdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index ac541a592fa..f1401e43530 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -679,6 +679,8 @@ static int concat_read_header(AVFormatContext *avf) cat->files[i].user_duration = cat->files[i].outpoint - cat->files[i].inpoint; } cat->files[i].duration = cat->files[i].user_duration; + if (time + (uint64_t)cat->files[i].user_duration > INT64_MAX) + return AVERROR_INVALIDDATA; time += cat->files[i].user_duration; } if (i == cat->nb_files) {