From patchwork Sat Dec 4 21:32:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31973 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp3904181qvn; Sat, 4 Dec 2021 13:34:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+YZt7pfUxzlpj6oQSnU6ghoyB29f/nwCiTNs16KMWY/b1JsrlcEB6vkZRMFMEhwHs8fAk X-Received: by 2002:a05:6402:845:: with SMTP id b5mr38793031edz.392.1638653656796; Sat, 04 Dec 2021 13:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638653656; cv=none; d=google.com; s=arc-20160816; b=wkM9Gy02GPJRivUW95M7fD3bK9kZRyocFpdjrdYloFT5fed3tQzUAQwGi/L00uwx2k xiNwdM2TaPrHGdPPwPhm9Z6dZRPhXXHilEp84LJFoOMkCmJ1yKFdOdrqZJG672R0odsz O3B4C0IuckLMUNf+Psec3ZNgelrpXIfopzMvCnhQRlV6k7n/cC9/ATDd9LGpzEOYuZ3b q/uVNvr5DVBb3VuczHFDIc+3PAJ5GKgxF/Fci4Dmo8rZacYeAq/83a4qaex8WunZqfaH VPTatbouwJgG0Ou60Gg16+AXJ3xUp+e4eJnvI8uTRoInAqDSDy2+4CraV/vNsI0yYuDg wBuw== 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:delivered-to; bh=rcwY1x4tiG/mwvpMIUk1e3wBb3yZWYo3biIsQD/ySfY=; b=mX8Khj1IeOVwUbhUOeTIQYqjsxK+lPaGHiCPHm6y0IeH53QAnVrKksChgR9df8n0sR 69oXefTLGIsrNLAP9h/Bla+cScQ+22UBCiio4rmdYJpxBUhaqZx2hN+7+5ZuU0E81VhR Btk7ptA8GEpGcGp+9K238kU6Dh2z9f4nviNnI0OiTbema3tLkd3X/6aXW0AM2BugAkOa Z/Tfom8/fHFnK2hpsdH6cx2yyiGC2k0O2oysVA8Cc7De7ezapq+MSxPfKxAUTBo44KBB nGL1PtNs1r607DByPlsAARDeV4YJSMwrO2T5WUFqRSuMZnHq3tWVJKrZcZcxOTmiH4p4 le4g== 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 16si9119210ejf.233.2021.12.04.13.34.16; Sat, 04 Dec 2021 13:34:16 -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 38E2A68A628; Sat, 4 Dec 2021 23:34:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C4BA68A8D9 for ; Sat, 4 Dec 2021 23:34:00 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mtcfP-00HUSN-0I for ffmpeg-devel@ffmpeg.org; Sat, 04 Dec 2021 22:33:59 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tceQmpERASgGFtceQm7zlk; Sat, 04 Dec 2021 22:32:59 +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: Sat, 4 Dec 2021 22:32:55 +0100 Message-Id: <20211204213258.11971-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCq3ZsY4VjhxjtlneW7LD7AmJGIRt3/b+HeJ66HRp50/cpcJmbdNTFFMPBVniykhDGrvB3q74NjiZSXVlfQ1RuACusVi9vj9b3IfcrtuxyJsFHj8vMN6 Vl9aa/e4F2/xsNnM3xY5TOfVD+7oDvDOu2KFTTSoUEZNflFX76t5YKun Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Check for EOF in mov_read_glbl() 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: 0925IgIpvSUA Content-Length: 1184 Fixes: Infinite loop Fixes: 41351/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5433895854669824 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 e34453432d3..ff5a55d0e62 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1930,6 +1930,8 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) // wrap a whole fiel atom inside of a glbl atom. unsigned size = avio_rb32(pb); unsigned type = avio_rl32(pb); + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; avio_seek(pb, -8, SEEK_CUR); if (type == MKTAG('f','i','e','l') && size == atom.size) return mov_read_default(c, pb, atom);