From patchwork Thu Aug 24 23:15:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4823 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp28853jao; Thu, 24 Aug 2017 16:15:50 -0700 (PDT) X-Received: by 10.28.109.27 with SMTP id i27mr178160wmc.173.1503616550204; Thu, 24 Aug 2017 16:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503616550; cv=none; d=google.com; s=arc-20160816; b=mxZF86xbrGg+uQ6gDLSzw47OeUDFhXmAsiECReFlUjuOpaQhYz6/d/hwEnzxDLyoGx qIznXYqbRdE/0Bt9gcqrfzFURzsms0tPnf7zobqQVQ05aiLBA3ciOzLXfuXpkt7J7nfk 1bUlpvu25Tsbnekm631syraS+QIBaamlbsZ8jrkH77JNcnqG5Rrhz84fmcEzgkJjFGk7 DaPB1E0jW3HltATi/VZ/x8d28Unu2u6fe2cna1/ZkWGu+X+Pl7Z2A1F919Gm6SRn2sdZ 0AGFwHZa3297paIdsLVZ4wBTkWqEbwkzYbACTS5evM7p4/Ldy9xNAcPzi4KzLeubKeni TjRQ== 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:arc-authentication-results; bh=HhZqjBeOVQ/ei9LpmIUyfFdJpPqcnnqCExzRNOln3sE=; b=c2NZx02Nl96kwUKfn+zuIu+7WhmjYSjrDQs75kthSsTLUlW8s8C6lJqQGQ2CZ4dGYc qvhhxizeQXmGifUAkQiiHlvM+qIHTXvLfT2r9fOZDHQVRbfzPhduMubhEsj0qt2M7k4l 4qXduIsxk3jQHjX8vmUNzVtZtb2+iX76HRYLBqvhgTdvftRkrDgsF/XsbMfHGFoPa64S oJMbnrMTXQ4k57+IpDhBB4MbFW+xI0s0ZcOD1HhID4+TPgaM/NBYU6W168r236h/lIPT SQDs5YQQ4c1njP7ux3iC1TfPHUn5Zz3Zff3YxoBeGKZEQl5hREQkIPqnd/mFRUdWvhEk 9WcQ== 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 w1si4059253wra.435.2017.08.24.16.15.49; Thu, 24 Aug 2017 16:15: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 C58A76883C3; Fri, 25 Aug 2017 02:15:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22B6468826E for ; Fri, 25 Aug 2017 02:15:31 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dl1Le-0006jl-Us for ffmpeg-devel@ffmpeg.org; Fri, 25 Aug 2017 01:15:38 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 1BFc1w01Z0S5wYM01BFdda; Fri, 25 Aug 2017 01:15:37 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 25 Aug 2017 01:15:30 +0200 Message-Id: <20170824231532.16002-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170824231532.16002-1-michael@niedermayer.cc> References: <20170824231532.16002-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/6] avformat/mvdec: Fix DoS due to lack of eof check 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: loop.mv Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer --- libavformat/mvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 0e12c8c6c1..f7aa4cbaec 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -342,6 +342,8 @@ static int mv_read_header(AVFormatContext *avctx) uint32_t pos = avio_rb32(pb); uint32_t asize = avio_rb32(pb); uint32_t vsize = avio_rb32(pb); + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; avio_skip(pb, 8); av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME);