From patchwork Sat Jun 5 14:31:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2017251iof; Sat, 5 Jun 2021 07:38:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpJPf29IaRE69EoIteHK9GPFxOfkWHoY5pnJIE3car4AY01mKSDjJjqmUOzooC+yItumTn X-Received: by 2002:a50:ee18:: with SMTP id g24mr10702645eds.11.1622903925545; Sat, 05 Jun 2021 07:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622903925; cv=none; d=google.com; s=arc-20160816; b=LSadPGfiEvdudCtcSMHx9ZnYFQDs/w4r+HwxAb9ckmCPuP3qLrdy80beMjB2iLl9WB ETk2ZV799wr65T+sab2pmQJGtOnAdlNhBC3Xt0wxwmNCvAgzz6mkJIfDWBoZJJdleWck i6JwqsrM9T3ikchzeOTLmpMn/yZY+MQx0RNbwRins2kjCofrn/9zUDQwUJbaLTgFkGVQ 2kKOItx3IgQ/oDm0aY/se8BkECY4UQo5HBBXT4pUPYLX0jfVazzzWoBNVWiRZK1dvr9O ds20oZyK5zUPA5yo9CWv9PnVXlgm5owumVmZNGj5fq9cvPSkbiNR8JukHdbVJ6GoTdgQ WrlA== 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=5T/i0M9nsfKYczN59omLrFTtLhXhWKZvqA1/y1Gvf2E=; b=fVoVmudPLtBnYnMNpXNzKni3nrHMdeXHGE+0993Vd3GIQczVZNkDqsvYhEMKdXZuAP DwMuSSEhaB78LYV5diYCu+heetykUrJ1JPYY+WQLxrs6uX3IJQqx93y991D3OR/WC1ri u4v3VzYXnlFfA7cf8W16nV8WwmLujzUBPJ65G7ONhJy+aBfAaFbkTDzH2Fw/Ec0nSHwg qlqRyv5xHTLUNR8ninxienxq23Z6lGiDcNp+FkoVu0wGw85G7UMTjsiRkpK+e0DSPg2g +Nj60kTWjuNjK1dZX1aVc2SvFh26h6kcM5WE3d+hLJ8c3/4hjM69PIfnOVkYCdEEp2Kw JDyQ== 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 hd8si7078574ejc.202.2021.06.05.07.38.45; Sat, 05 Jun 2021 07:38:45 -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 94E6D687F2A; Sat, 5 Jun 2021 17:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B10E0687F2A for ; Sat, 5 Jun 2021 17:38:36 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lpXLu-00CoWK-09 for ffmpeg-devel@ffmpeg.org; Sat, 05 Jun 2021 16:32:42 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pXKwlY5YaljeHpXKwl7UiI; Sat, 05 Jun 2021 16:31:42 +0200 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=BoHjPrf5 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=nZOtpAppAAAA:20 a=S3w5LXLZDDSGmtBKnZwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=bWyr8ysk75zN3GCy5bjg:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Jun 2021 16:31:42 +0200 Message-Id: <20210605143142.18125-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfETcVGNNd7S7AgrHLIGRzZi9L5V/XDXvAF48IZJTdQxQMHCSYuhei8Y7Pzy9pSXsghH3Ll1rHcr6BGkjExnEravZFhAZsKQYSsqubzmH3x7x+jeWDpJb GHtqa4IP/jztoVOFW1P6kQ4uXVke63ztTmejPZIo0wp1Bd6U0ucw12+5 Subject: [FFmpeg-devel] [PATCH] avformat/rpl: Check for EOF and zero framesize 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: vRtRF0O3lycq Fixes: Infinite loop Fixes: 34751/clusterfuzz-testcase-minimized-ffmpeg_dem_RPL_fuzzer-5439330800762880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/rpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rpl.c b/libavformat/rpl.c index de32490fbe..fac377b68e 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -339,7 +339,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) avio_skip(pb, 4); /* flags */ frame_size = avio_rl32(pb); - if (avio_seek(pb, -8, SEEK_CUR) < 0) + if (avio_feof(pb) || avio_seek(pb, -8, SEEK_CUR) < 0 || !frame_size) return AVERROR(EIO); ret = av_get_packet(pb, pkt, frame_size);