From patchwork Thu Jan 6 08:42:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 33111 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1455596iog; Thu, 6 Jan 2022 00:43:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJynvuWYr+K2Zx/dKta1S4GWERihq51P57aIzdhaXNFINF7p3L+bB4LHyy1bGthvluvl54/p X-Received: by 2002:a05:6402:274e:: with SMTP id z14mr56612605edd.369.1641458592498; Thu, 06 Jan 2022 00:43:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641458592; cv=none; d=google.com; s=arc-20160816; b=s9e7HA4udyVN3pTgLkjF+7g0e+4HKlPl1o1vGkQFmwShGzkNnAydBezU34vK+vfqOn amaEhkZMryVCO9ik9ty1xw6tQhAbwMtrJOEWzkz8Cn/dXpeNIhfiISwDRtueYHHhCFKe DofZv41rnDQyyJNp88Nj6O8hmskUZ7wsh5HlGS3K0YYztwIkx9W+a1Nq+hUNsVAv0fni AZdbJxpJnGQ2w0AgBtFKweEI69whQae89iHxtWYQjWtzMyBdotMF5Box0zbBh4CQGyC9 CLz/HfCwJAo/bzYo778sdXBFA0Kob8cprcn/HxhHm/++xwr/jndrwhX5i6vz1rAtk1ek 345Q== 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=SaX1C/E3MwMccfYNdiQl15LWsHItKK+Jj0bIV+kwPZ0=; b=aZZw2ELO6LLBLJfjyLn6K9nhJnnu1GGNp0S2soGIQi+7JbRpIYHZ+W6gR5ezYxJ5n5 HkOXV/2T0hWTI+E8vuMpG2ogr2ZaXsl0Zxr0bdK/3MmlPV/SEbnYOYvJdFup8U1g7t5G XDXN1nyLOyATT5N2/UOVhexOH49uJAeNydmfpNf7f6D3MKvltxt6e/S6i4CHOGzswhHA tu/xgo7DgkJsSloGeFUiTeO/nPs+ZjXnXMVSSRrJXSm4pTrFfGroGjjJ6DP4EET315zu ILLwRKi1eYw4BQIWGjDo+KIj0LAAB+XsO7Vep1BSF1M6d4OJboxf9EoD6VTAnQ0IVf5/ M2Yg== 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 o4si752260ejy.369.2022.01.06.00.43.12; Thu, 06 Jan 2022 00:43:12 -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 3303768ABCA; Thu, 6 Jan 2022 10:43:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 706A9680CB2 for ; Thu, 6 Jan 2022 10:43:04 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n5OMS-00Bz4L-0L for ffmpeg-devel@ffmpeg.org; Thu, 06 Jan 2022 09:43:04 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5OLUnOk5CSgGF5OLUnRsJF; Thu, 06 Jan 2022 09:42:04 +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=u0XJr2l25COyFfKKAO8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Jan 2022 09:42:03 +0100 Message-Id: <20220106084203.27906-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLEUkWSKDJTQWc3+AIHSy4gYV+ICdsuar5BXenhnyhlVCtebto3hMuLZFkVqdJ8SSYadXEuXWz9VqNQbvO8fOPE8rSW1f9w4bGgVzk+un5T60J8TGAqw alnWSc4Lc7VjDQjCCwpWdSJqlCsSo8zUBTG1yWuHp7oEV0TdlKNL4fyW Subject: [FFmpeg-devel] [PATCH] avformat/rawvideodec: check packet size 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: MOd/9Z0mOD5m Fixes: division by zero Fixes: 43347/clusterfuzz-testcase-minimized-ffmpeg_dem_V210X_fuzzer-5846911637127168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/rawvideodec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 68547fc50ff..7581ba2c7d2 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -100,6 +100,8 @@ static int rawvideo_read_header(AVFormatContext *ctx) if (packet_size < 0) return packet_size; } + if (packet_size == 0) + return AVERROR_INVALIDDATA; st->codecpar->format = pix_fmt; ctx->packet_size = packet_size;