From patchwork Sun Apr 25 19:40:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374228iob; Sun, 25 Apr 2021 12:41:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxikQM08Jr/MhsF5HQYZkFdxxk37PpW6iCB+Id8fH59phztScLZKMURcFEFvF4EGybyvXoi X-Received: by 2002:a17:906:5619:: with SMTP id f25mr14502486ejq.393.1619379696514; Sun, 25 Apr 2021 12:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379696; cv=none; d=google.com; s=arc-20160816; b=J72rBbbrHhDE1/U1Y8Tdu9ZutKWFAduvoAXP0jag6ffSWJBm8cXQT069J9ZkVw6Rn/ KzQyqVQKi8aPYVrQco5b1aWYDaljdmQfQ5bhiZhfdKbN+bwIJff73ORNjCVoctvwFW7O O+VSD1IQEteX4ehMkN138Yi2zpHOrklopdhvk6WYFiIfm2uoQk34gmsshzQZcbu1g1hx anVE+o9k0Bw+qlEPatEJLNrUlHasdKu7wmHu5WK9JcgtN071tSf750o4elQP3WLbRYEh rdzMVXIEe4xNEFEClTym4grZi6dqUozxBDaDXMIT1aJYbvCwn/m+1/FtC6kyQwVqdG0d NzOQ== 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=eKzTdmj2fF7RzwEhUDoalAiOCo5mUY/L88do+/jf+vQ=; b=0cRDxi2Je8qUsvRiZIUOmeAgJfxn041nKi7FsvpHYeYC28OrBzSwHDyBwm334zZSCI 0XILoRC7t/xu/CERrf6bQoBvLdmMG8Vt8mGlEQtC8WRGeq1SH5MRKphYApNJDzjH3D5a CAJdOc40XBB+OIs54FVhEsUFqfDy1So2RjtPf6w1nglaah2BsEm+/O5LkuaZbsqHgFEn xxf43Qk9W+3u1SBDk0UGdXy0CsXSbCIECEATnIy/B+NbDnpzUT9llqoDtxqCQQejTj3t l2x9GiV78xZBTDl9dQdITJzUkB9SIM3Mxb4J6ael6uM8bjvPUVYSlO6DkjUJvCKwitqk 7WTA== 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 m5si10854120ejn.599.2021.04.25.12.41.35; Sun, 25 Apr 2021 12:41:36 -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 D9E1E6808E4; Sun, 25 Apr 2021 22:41:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91FE4680CDE for ; Sun, 25 Apr 2021 22:41:14 +0300 (EEST) 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 1lakd0-007rya-0B for ffmpeg-devel@ffmpeg.org; Sun, 25 Apr 2021 21:41:14 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id akc2lFjbTljeHakc2lu0hy; Sun, 25 Apr 2021 21:40:14 +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=Qw7tQhG-lC0x1BXttaEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 25 Apr 2021 21:40:10 +0200 Message-Id: <20210425194014.957-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210425194014.957-1-michael@niedermayer.cc> References: <20210425194014.957-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHZX24EhB7x+R1vJQyabIr7eBWu9dw3XuKNwpt+RkQFvis0/vUB7s9NeUxjCqCv6mhYYrxg60DutEv6DdIfKJK2vBz1kR3kECjUAvWYsq9HB6qEv6odi jOafR21Yfnvp2Rcf6asRoj9HSENOfPNnGvkXpfkJ3OXi69g/JOoC/YaC Subject: [FFmpeg-devel] [PATCH 2/6] avformat/msf: Check that channels doesnt overflow during extradata construction 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: qLXxwwLQRO/h Fixes: signed integer overflow: 2048 * 1122336 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MSF_fuzzer-6726959600107520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/msf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/msf.c b/libavformat/msf.c index 155f488e44..1eaed54357 100644 --- a/libavformat/msf.c +++ b/libavformat/msf.c @@ -70,6 +70,8 @@ static int msf_read_header(AVFormatContext *s) case 4: case 5: case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->channels; + if (st->codecpar->channels > UINT16_MAX / 2048) + return AVERROR_INVALIDDATA; ret = ff_alloc_extradata(st->codecpar, 14); if (ret < 0) return ret;