From patchwork Thu Dec 23 21:15:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32870 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7620832iog; Thu, 23 Dec 2021 13:16:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCo5FcCZGddx66zrrhPGRLlUiNcmc+6coU1erN6s1ayEVSLjgjqUwp4BX8Y2Js9k485PZy X-Received: by 2002:a50:ed01:: with SMTP id j1mr3468362eds.126.1640294201042; Thu, 23 Dec 2021 13:16:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640294201; cv=none; d=google.com; s=arc-20160816; b=gdc0bKcR64PFK6fYbcQ3sHHkEg5NCFQLKuHv57z6lY7ZITcqch6iWAZvVDLDl9NSW2 cg3KL7I2LEl6qMpyTHU3qi+M0gWjAjtsuuIVKw4j5C3ge2wmLXatwuvE7T9ql1h4xUxg eVNiiCcrslI6oSd+K1Bbo6Byx1SRl55iKEHMwyKg3gAZ36jDRGcBR52eYBc2rwjFS54K IcZZaoLf20IFtNx7j6D7DIdOAeWLoKNdgTMvYT9QcoLRyXkIby0/jmhEPavmDg8x5eax 7s+qnEiF0vEXwUK0H3vl3JvVoxu9RaVqz75+4VUIemEn3hp19GWkfdlkPVMBpZtekJxW +G5w== 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; bh=bi9K5JVVWfRnvFietbUSCLWG9u+Q6oJcvlkwh7wzkqk=; b=jx9aho6n4iSqIDDuSihnmvj/QdUlSRoNUGHJS0OMuLwlN4jSWD1YYd2HORIeoS61Da StcfeFA7N7JjSSbsiuYRYTij08s3paruFlKiwml2kcJLrZ2FUN4xd+DLJ4xg/vlPALSn 53RDjjEpN+baCzE7P37QHhEbvq8VrF9glIaKCr4UH5+ERO50ogCwFHENFWUX7iYXIuLU 5h1AMf4CYrke13ACVo+NtgHH/FD+eBK4H7AcK1dB+i5tXBoEOJKvz5y7c0JNAZS5bR6I q94d87WpDg+9F7lzVG8cO0p6PfmQ2IOsZwO1xIRaHwUjBk8tWKin1ThXs4EBHfkQTN/S hnlg== 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 h3si3451205ede.422.2021.12.23.13.16.39; Thu, 23 Dec 2021 13:16:41 -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 74CA968B1AF; Thu, 23 Dec 2021 23:16:35 +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 89A5B68AEE5 for ; Thu, 23 Dec 2021 23:16:28 +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 1n0VRs-00AuDX-0F for ffmpeg-devel@ffmpeg.org; Thu, 23 Dec 2021 22:16:28 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0VQunM8NUSgGF0VQunabYu; Thu, 23 Dec 2021 22:15:28 +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=JMo6NDeKBe8AcFON-J4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 Dec 2021 22:15:27 +0100 Message-Id: <20211223211527.20408-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211223211527.20408-1-michael@niedermayer.cc> References: <20211223211527.20408-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJcCTGtosQs0tcnrCF6utPh4b7FPGgQcBTTtlULIlnhbS2gmYLQdWZYQInFu+WDmgh5n4rl9VA0ffK1CvYlGu2+ayU9KSj0MgxWsGvDhjbPy77z3VKgc esBOUieu13Ozs/rN7/r3DF+TIEfB7FFZazgeK7wy20iLl22q29G4xW9u Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mvdec: Check bytes_per_sample 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: j7KWyHiTQ8Gf Fixes: division by zero Fixes: 42814/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-4787014237552640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mvdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 1a5012e5076..390f6ba4de8 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -366,6 +366,9 @@ static int mv_read_header(AVFormatContext *avctx) avpriv_request_sample(avctx, "Audio compression (format %i)", v); } + if (bytes_per_sample <= 0) + return AVERROR_INVALIDDATA; + if (set_channels(avctx, ast, avio_rb32(pb)) < 0) return AVERROR_INVALIDDATA;