From patchwork Mon Jan 17 22:32:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 33644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3185516iog; Mon, 17 Jan 2022 14:33:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjTYz5ldl2ROeSXpTGaPzwPZIoJ0td//wXKgs4K4iF7H2KcrfzPFwb7uBISzyb6NGAK213 X-Received: by 2002:a17:907:3f92:: with SMTP id hr18mr18099703ejc.693.1642458836529; Mon, 17 Jan 2022 14:33:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642458836; cv=none; d=google.com; s=arc-20160816; b=D3QgBLrGs8SwZWNIyYLCtDBDK3oyefaoWi/FjgpU7o+tAdBX1C9MfJViFS/SjFxSor p8A6CDZDN+jDlNuHVeMXpPDFS8gXnQRjHCDAJrem05grQI8pCeYov+nVDOYM9t9RqYEZ qUbrj7DPEPUUfMvNKioMm77Hdwy/q+u2BRMIk6glJnB+Y1sAqL6iouMmXUUtvvqi4GSI aysksNYYXgNY33s0fUuyc8peCFH7L+Fi7hduYcMyYtUWcLJIVWpklhbHTOGpkITIVETw mDX75BOO0o8hH8kMAzh6HCApKBz/LAVpGQ4ZOprUVtci8P+cjE1FT8HgzttNfMaj3jJn Hn/g== 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:delivered-to; bh=fIKTHGhRGuAoxdzZJRVUmqUHCJyKlWDOWqXNTfDTots=; b=LYA08s6CCa7MxQgz2AgKZ0OO687lrX6CC1A1ZlVNvSk12T+JQ36I/k+RxT4Z/WT4f3 r9vRPk7C9L1w9Cq92E30FC0e3JJmjefUAyKZDERFXd1lr8qyK7+3ZxT7s7gw37312+e4 3tcAZG/P4Q9pKaP68u53OzkccFV/yIWYJnPJgg2LqksM7xaToQVUHEEeLpFrOhR3KSnC xKXGcfADu24ATgv+Z/nzGICt6f6Zy2LxqNNt5HWUkNjF5pGZ40+pp+FZdTfgmKBkGAux Hty7Jhtu+aYdTypYW4ctlSIAph5RF6NTh574gnUlPUOhcM4vIUaFrg47pNr2658qMABo yJpg== ARC-Authentication-Results: i=1; mx.google.com; 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 q11si8153996eds.116.2022.01.17.14.33.56; Mon, 17 Jan 2022 14:33:56 -0800 (PST) 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; 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 69B7468B093; Tue, 18 Jan 2022 00:33:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 467E768B063 for ; Tue, 18 Jan 2022 00:33:46 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n9aZO-000ZEK-0N for ffmpeg-devel@ffmpeg.org; Mon, 17 Jan 2022 23:33:46 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 9aYPnN1kOSgGF9aYPnysYc; Mon, 17 Jan 2022 23:32:45 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=qX5wZS9MHFB6eZLz2DQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jan 2022 23:32:45 +0100 Message-Id: <20220117223245.31928-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220117223245.31928-1-michael@niedermayer.cc> References: <20220117223245.31928-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPSdywsjXAsWKU9IN9Y9z95Ey51xkwTXrqZfwJHKQ3n+/lAKFS+1mAeDoc1QvrCL+d9+TyJ13qxtBbSUnqcekQthOiQzlrJnKf5N99xt1iWAA6T/IoVh EivZmAOsf0Mr7IMZE7UmlStGliSvWV5mUInVlv0RXU4zsoMYFiJu0BVt Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mov: Check size before subtraction 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: TN9xz0L2NJSj Fixes: signed integer overflow: -9223372036854775808 - 8 cannot be represented in type 'long' Fixes: 43542/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5237670148702208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index e401cd39b5..063cc2bae2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7329,6 +7329,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (a.size == 0) { a.size = atom.size - total_size + 8; } + if (a.size < 0) + break; a.size -= 8; if (a.size < 0) break;