From patchwork Tue Feb 8 20:23:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1123750iov; Tue, 8 Feb 2022 12:25:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyu8Cq+GzZ+ZmZW9jDkzKntFVF8N4KR4ajNpGLhYcpFE3K2yfXPz4cQ5vtcqW4XaOwVvYl/ X-Received: by 2002:a05:6402:289f:: with SMTP id eg31mr6406843edb.33.1644351915474; Tue, 08 Feb 2022 12:25:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644351915; cv=none; d=google.com; s=arc-20160816; b=JUlbO5uNi4zyQfTZNG8nFuhNkoWKHfVoBXlPQBTldWJgV+rDt3yFDltP2tbHgyUXxc +zTYtrGhWGVr4FCADIr9zFJN06r9hDLIlFbH9orH/v2Mhv01z38fIuKq53ik5Ylj2Ts3 ouCo3HvwDw5EdaZnC79E5kTiTNTyvWTuJTaPci3xIw/WMMsIau09upC1X/5NN/bFgjmV l/tvpXvEmOgo2Ndx6r+BbIRqDe3c6+S3lcnZq4KCYojzc18cvbpuxq1CFbte1Zj2Ft// gJJtm5skKtNN1E1TzwvM/BAqWS7lcH1Ujveiy/0vsrT1I5WWM4fy9uHQDhVwyDviUyn6 tW4g== 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=iQHlxqGji7M1HuB/a7Hfh5Fqwqxa4F+6MM8VqaEZzwM=; b=crtHLWnqt7Fqlyp73P5EJydLCwQ3M5BQfs1OXkXGQPte122UN+aIkTWLdz/5OeIr5X 3FTHzs3SQbg4DUZcM0WYtbNZ9RV3aEpQe25XgGM1tgCQmdf8gghyb6GpCL5E6uJcQ68h O5bsahh3fhrH+41vRLfNmarAO+ylKqLbBrM9TWf57DchEYbJ2AoHxaVbKWYbP2HTi/mf 4GsqbfEtPN3Mj/9tba0ZZJHhTEN6Jn3592IQnUqtcjk/9Io9MJbRSIhmwpN/QAz2i2Aq 74yL5MYTlxRtj/IA0oceJameDkzwlPvR6v8qPROJtEk+BjLoC/+6ZR0MUqSGJZJky+Ot HM2w== 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 mc21si2894823ejb.765.2022.02.08.12.25.15; Tue, 08 Feb 2022 12:25:15 -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 655DF68B109; Tue, 8 Feb 2022 22:25:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09C2A68B064 for ; Tue, 8 Feb 2022 22:24:55 +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 1nHX2k-00GeMt-0G for ffmpeg-devel@ffmpeg.org; Tue, 08 Feb 2022 21:24:54 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id HX1lnDgqbSgGFHX1lnJawY; Tue, 08 Feb 2022 21:23:54 +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=WUtiJCYqyc0KKhqFAmwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Feb 2022 21:23:52 +0100 Message-Id: <20220208202353.19554-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJsz68hyVP3aX2L8YvCDzbtL125/WF4F/DPIk7zVnVQmsqVnq7/Q8RKx0DyKYrYet+cU5rMggtUxZs96GBl4gI6J8iHw+t90TFgoSRsbfvjtkbVjI5wm g8TFzZSGEDm1K0Bdrf6fP3IJpeMA65s7vIiQLwnkpkdJmEmAbeG+AC67 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/demux: Make read_frame_internal() return AVERREOR(EAGAIN) on stuck empty input parser 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: BWRaQCQKdmD1 Fixes: read_frame_internal() which does not return even though both demuxer and parser do return Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/demux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/demux.c b/libavformat/demux.c index ec34b65288..dd42d32710 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1222,11 +1222,15 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) FFFormatContext *const si = ffformatcontext(s); int ret, got_packet = 0; AVDictionary *metadata = NULL; + int empty = 0; while (!got_packet && !si->parse_queue.head) { AVStream *st; FFStream *sti; + if (empty > 1) + return AVERROR(EAGAIN); + /* read next packet */ ret = ff_read_packet(s, pkt); if (ret < 0) { @@ -1317,6 +1321,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) } got_packet = 1; } else if (st->discard < AVDISCARD_ALL) { + if (pkt->size == 0) + empty ++; if ((ret = parse_packet(s, pkt, pkt->stream_index, 0)) < 0) return ret; st->codecpar->sample_rate = sti->avctx->sample_rate;