From patchwork Wed Apr 28 15:06:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp516424pxb; Wed, 28 Apr 2021 08:15:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyy14OYPaii6FB5MZ+PCqZcvw32iMGTobcews2i4//TkWSHR+1pF1PcpcpByg3hfLqA+n26 X-Received: by 2002:a17:906:a20c:: with SMTP id r12mr28915496ejy.554.1619622912933; Wed, 28 Apr 2021 08:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622912; cv=none; d=google.com; s=arc-20160816; b=LenkSJAd/1WyD6BcwJ7E5bOYh5bHvnQ8iMh05FV1YXO6mm7pqpiNkozFbpW4D8DacC XUujYlKmRDMNJsr8m2BjdMV8ZiHm46y5cXgYixLqXZl4TatC5IEMqhakfzbR9wu++zm6 sZP0NHMxqmjzi6iIEGQqEnR2pWPHDg+CVYsOOA1JBuZqRTt674hRM8ksg7vRioTL9Rxd pqoGCIJhf2nYARuFuoRqbkdgmPX7yT2Rwzxv9Co4ftgtNTI9qewJ4TdlHU18sfN8ObSC 3m2IBxa2RIwVTcGoChbbADqS2OSjjURdMt5frFOe43KOrDOIjCOky47TGdo6EOnQjIPO ikFw== 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=ovS6mLdf1I/grPSvK27JVYxxauGapLOAlMlZU7MLiQ8=; b=P7YaMqTh9DVzaNjnn5tzM3L8iWCeVMR5F/uvB7kyjobLcdLTqJdcVbjN161qUygcwm Mm1PnI9wuFv8ty2wGSgPUjbu9nI1Z/z9OIasFgb7FFLUnGu7pYo3E13qMRmQemuQmO6o 7hSbJGTcZrHiG2lbVXy3TPZAUH0rI9WzQm7kkN/C07IdQJf/bmrisGfICmF2kWNKHDYI YDBbiRTrw0udd/olMPIgqJllvIosi1WP3JqzdIjeMFa1zZtbV6nkXoLSTeZiC4RmQ4hJ la8onQPMfWKi7vgUV9owtLSAvWtfZJVbzfTpIN8r20vUj25y4Ket193PGON1nYme/qAF 60IA== 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 hr29si252687ejc.136.2021.04.28.08.15.12; Wed, 28 Apr 2021 08:15:12 -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 D422F68A252; Wed, 28 Apr 2021 18:15:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BD226899E0 for ; Wed, 28 Apr 2021 18:15:03 +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 1lblmr-00CGWj-0H for ffmpeg-devel@ffmpeg.org; Wed, 28 Apr 2021 17:07:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id bllslck6QljeHbllslNuhu; Wed, 28 Apr 2021 17:06:36 +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=1CTyiEAt8j71vDr9E5QA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:33 +0200 Message-Id: <20210428150636.28396-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mvdec: Check sample rate in parse_audio_var() 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: 6jU7PsxBuDge Fixes: signed integer overflow: -635424002382840000 * 16 cannot be represented in type 'long' Fixes: 33612/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5704741108711424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 2f72f9eb4f..b1450e08da 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -157,6 +157,8 @@ static int parse_audio_var(AVFormatContext *avctx, AVStream *st, return set_channels(avctx, st, var_read_int(pb, size)); } else if (!strcmp(name, "SAMPLE_RATE")) { st->codecpar->sample_rate = var_read_int(pb, size); + if (st->codecpar->sample_rate <= 0) + return AVERROR_INVALIDDATA; avpriv_set_pts_info(st, 33, 1, st->codecpar->sample_rate); } else if (!strcmp(name, "SAMPLE_WIDTH")) { uint64_t bpc = var_read_int(pb, size) * (uint64_t)8;