From patchwork Tue Sep 5 00:55:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4986 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp3613919jao; Mon, 4 Sep 2017 17:55:50 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6GY65kpP1VLoq7QOsjBrvLYL/R7uLaksOSygFZhbyMWVs44uE394POCjlqA+/rJEBBDYi/ X-Received: by 10.223.192.74 with SMTP id c10mr1203334wrf.296.1504572950890; Mon, 04 Sep 2017 17:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504572950; cv=none; d=google.com; s=arc-20160816; b=cMTu4L0rejTeOeFsnlaAmLiEAleyasm9w38e49fbEuzaaYo0mINPMMZYjiXCDIws0/ h2MJ526EHGZTGrFS4zorY5BrIY7XfZ4oUTJWfYZmrLYYwuSk5mXqPub3q8tNOWNzOMEo ARxQRahAdYSt1ArkHlHQo00OcujCO3wj83XocNpJ1eK43n1lGcJvfAIpcADZ3FzHxxfZ ntdOtvsS0PfeELnR//C7HLr2JXvI+LRhzKacjmomNiyS19eNkSiANxAWrh3Jf/ZQbXtZ rF5uw+u6L3V2R50LijTjBJWqBO8eDGbpagrUBCPvKqvM8laYsrZVoOJtqHU7yZRSI6Cz HBZw== 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 :arc-authentication-results; bh=VejoSHUaWpU7N/ADoyzqutLMau+aw9UjKrZuYTs726U=; b=Dk8owZNSC8ylRd8mJhQ7x7Qp4J2GeqoUzsoXKlWfc7EM8Fle3n0pAEnTAJJbTJSbu0 2L+LQOm8ygQrISZVRjlF/BcyIeC1b9yj07RTXVVkBwepY8GwdZcZfeqfYmalouMSJL3u 0rBeBvBW5Q7L0FGaRmqmnw+hdDIZ4sKZxZMU/o+8B7/1SZdcOMVfhjBrDjN+vWllFVkM xXL4AKUPr1xM6psS7ERvA+vToJwLSaSZ7p4t5XvQUgNKsDmeqTxdtw0grgA3CmroEHhg xtT/RvX1bgc01I29vB6zKZx6zzMDfuID8YAVTLKmrcL5i+hZn/BeAqAEnfrJbUX8r0kN FmAg== 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 i5si1201946wmf.199.2017.09.04.17.55.50; Mon, 04 Sep 2017 17:55:50 -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; 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 C930068A188; Tue, 5 Sep 2017 03:55:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32A05689D39 for ; Tue, 5 Sep 2017 03:55:29 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dp29L-0002kc-LB for ffmpeg-devel@ffmpeg.org; Tue, 05 Sep 2017 02:55:31 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 5cvT1w00Q0S5wYM01cvUks; Tue, 05 Sep 2017 02:55:28 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Sep 2017 02:55:25 +0200 Message-Id: <20170905005526.19078-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Fix DoS in read_tfra() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: Missing EOF check in loop No testcase Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 994e9c6eba..2519707345 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6094,6 +6094,13 @@ static int read_tfra(MOVContext *mov, AVIOContext *f) } for (i = 0; i < index->item_count; i++) { int64_t time, offset; + + if (avio_feof(f)) { + index->item_count = 0; + av_freep(&index->items); + return AVERROR_INVALIDDATA; + } + if (version == 1) { time = avio_rb64(f); offset = avio_rb64(f);