From patchwork Tue Aug 29 23:20:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4882 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp3609795jao; Tue, 29 Aug 2017 16:20:56 -0700 (PDT) X-Google-Smtp-Source: ADKCNb78Gd4J9yiS4n9RCuZR3nlNSMQkrAqt2/oRVnieOPs6pUrbyn1G2phudsr8+AxWcvvg07cE X-Received: by 10.28.209.131 with SMTP id i125mr51121wmg.51.1504048855974; Tue, 29 Aug 2017 16:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504048855; cv=none; d=google.com; s=arc-20160816; b=xHtilyEYHDNf+vpS++6JmtPGNk9ySNvcrnTUWtn0X690xW+NG/NsNr+IfiyGHAz9lI amOCjRcVGOdAgn4Vu8ck6+24fnNoAHkX7sXEApzg0ASY89KvAgaqGUA8tA0FOoyJD0V3 LleBBJf4F/K2vAJgOn8uDYfisyhSHpdB71Ek2h3tRd2dqj0KahjNPL/IUtFjr0A15m57 bTeYBQmIKnaEpwq04uQPh/84B6ifeYfWW6fUvZVgyxG7DpT7rSMeFFBE3kyqsJKYe2TS kTqHqaQRDkNzCHNW1QQeR/Yt/Fl2Dob5v8iy7bA5GbzkiudsTgsMAzgsT5xj3HxEsXEM cHAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=WUcqZTukXZlbe0t9wqXmUglDUY+GJCurKeJutEbwJcM=; b=JM9rb/vHx3HAYFbCsK6h8oGYRbtWj5EO07YlESVFUkk1ueD0D8X5A5wpobIXDUFPXf X4xxuuiJl0L13bO5SBu9qGi5YGE/hiYarvPtQNo1rEdtuR5CJSgHoj/HPGEojOqz9yG5 fnE1iY+Bc+vhBwMl05mYRBs99gY1xVDyUiUoomNaknZYnZ1vJA1SE1GgR00J7/ISaRnE aVV/diTI4LqawgSPh1MYQjx4mLtDc2Rg+jMPMV0f4sSMT8L1Xb23XwoI6N/YHHk9pThD A2j+y0WPSa9cQSGBgaybWM4SEgB7ECwfViFwNkBfp4jLWAaox5etw10CvweYeEGiGetc prZg== 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 d26si3194415wrb.372.2017.08.29.16.20.55; Tue, 29 Aug 2017 16:20:55 -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 7660668A210; Wed, 30 Aug 2017 02:20:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-1.mx.upcmail.net (vie01a-qmta-pe02-1.mx.upcmail.net [62.179.121.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5615868A08A for ; Wed, 30 Aug 2017 02:20:42 +0300 (EEST) Received: from [172.31.218.33] (helo=vie01a-dmta-pe01-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dmpoI-0000eF-5D for ffmpeg-devel@ffmpeg.org; Wed, 30 Aug 2017 01:20:42 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dmpoC-0002fj-Ei for ffmpeg-devel@ffmpeg.org; Wed, 30 Aug 2017 01:20:36 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 3BLT1w01L0S5wYM01BLUbh; Wed, 30 Aug 2017 01:20:29 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 30 Aug 2017 01:20:25 +0200 Message-Id: <20170829232027.32431-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/nsvdec: Fix DoS due to lack of eof check in nsvs_file_offset loop. 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 Cc: =?UTF-8?q?=E5=AD=99=E6=B5=A9=28=E6=99=93=E9=BB=91=29?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: 孙浩(晓黑) Fixes: 20170829.nsv Co-Author: 张洪亮(望初)" Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer --- libavformat/nsvdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index c6ddb67bbd..d8ce656817 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -335,8 +335,11 @@ static int nsv_parse_NSVf_header(AVFormatContext *s) if (!nsv->nsvs_file_offset) return AVERROR(ENOMEM); - for(i=0;insvs_file_offset[i] = avio_rl32(pb) + size; + } if(table_entries > table_entries_used && avio_rl32(pb) == MKTAG('T','O','C','2')) {