From patchwork Sat Apr 24 15:59:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27275 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2202732yba; Sat, 24 Apr 2021 09:01:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoaFwRlHkeyxFZU9+fiJGp0Pk9Ck9pwDbxEMh7xqht5ap+ktb/hXCGbqDEgDhf8yWvUK72 X-Received: by 2002:a05:6402:270a:: with SMTP id y10mr11108569edd.387.1619280064971; Sat, 24 Apr 2021 09:01:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619280064; cv=none; d=google.com; s=arc-20160816; b=v5PLqnUuEGWKjbVCCxgSGljJPEFr8MfPTM0PoyQfz8URLec26sUd3KjXDLhqmXsjFw oCuXnz49+8J38/q0WvWEOg8S6+FJpe30Dkw637OnXRNSRc6s8jyGsDc2e1th8V4h04W1 ajPwLF7iiG7eiqnt6tkhjGaARnMWE2wbx65rLfJb0okwEluyswXJfNUyaJ56D0BNTsNC hZC1zkny5DWM4K8HR0uG7oGTRzSmQiU1dxr+edZyujtGy+Zzui7/3rFIj8KrWCg0absb U8a6sQuTphTe4mVLHL/zflHPKUWP8EYS9Qtef5/RuXr2kqB20WM6RAET0c4zcxbftcC7 tXRA== 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=2eWqFvdReDjx8hH02xza62QsSCKuYH6MvpcXf2Wipt8=; b=pBAcTtCrxNPTtTmcYkVSnYJ7WIC4wL9Y1kRVJAuioRSTkn8abksAgoJ6I5rNoYj12r oKPGVjqyN/xYPrs5YzTEONzqSaWuABNvjhWrK+DgeNFiIuxv/ut9lJDSBuJtDW0eQV+d sX8QC9maPMV6BEdKjwdgX1BVeamHwI/FSBQyjf6Gepz05Sc/9D1cA8GM4S1Eu/Aol7i6 X0RSJL+0Ewyg6vIxE0yD8YAMr4LyukiY3Sy8GRd0yu++6cNsLWcx+9viTNQokVoCUDIL j3ZCK0VtxdD5TWuBfAx4cScWoxqPf6suFXYe65JDFW0RC2xBDgYhGw05yWFf7Lh89g7l U+Sw== 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 y6si2123319edr.344.2021.04.24.09.01.04; Sat, 24 Apr 2021 09:01:04 -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 8241B680C4F; Sat, 24 Apr 2021 19:00:37 +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 69287680AEA for ; Sat, 24 Apr 2021 19:00:27 +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 1laKhn-002U89-0J for ffmpeg-devel@ffmpeg.org; Sat, 24 Apr 2021 18:00:27 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aKgplhTQRljeHaKgpljNBy; Sat, 24 Apr 2021 17:59:27 +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=XgWULi_iT2XPd3FFU8QA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Apr 2021 17:59:25 +0200 Message-Id: <20210424155926.4018-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210424155926.4018-1-michael@niedermayer.cc> References: <20210424155926.4018-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPZ3Z1/d1B1RjEyEHujd6P/DZT81a7mZRRLm8iPdr/XjDAcFwJPxAhqMct/di+mLV6hpy1Kt74DthEXZ49p/e0LU5kM2DFWFiIl4/iaQ47N9Cwp0LBVg UC0gzUhKxq1r8rzOvOl3kqgdNGtHNn8W0xz1OjJl+RbbJHgv+zW5gwD8 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mccdec: Fix overflows in num/den 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: 2rw5FbukLd9X Content-Length: 1200 Fixes: signed integer overflow: 6365816 * 1000 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MCC_fuzzer-6737934184218624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mccdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/mccdec.c b/libavformat/mccdec.c index 2a0b7905a0..7671be61d4 100644 --- a/libavformat/mccdec.c +++ b/libavformat/mccdec.c @@ -127,8 +127,7 @@ static int mcc_read_header(AVFormatContext *s) num = strtol(rate_str, &df, 10); den = 1; if (df && !av_strncasecmp(df, "DF", 2)) { - num *= 1000; - den = 1001; + av_reduce(&num, &den, num * 1000LL, 10001, INT_MAX); } }