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; From patchwork Wed Apr 28 15:06:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp514962pxb; Wed, 28 Apr 2021 08:13:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw20Cof5duP+e9jPjj/fpcC89E0K/Q+18LxaBaJaUmN9SjFZl4+V0OBJhcZGNxWI3Ujtdd X-Received: by 2002:a17:906:c218:: with SMTP id d24mr28870033ejz.363.1619622829015; Wed, 28 Apr 2021 08:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622829; cv=none; d=google.com; s=arc-20160816; b=Kdhal6UwNJRIo8fLTopl62y95fbJrNXrBpcdM398cQ4XyIfo75HONGaQf77fBVONrx jH/WpHTKMY5x/Pq+StYbQlAyVS+RQfDIPQW/HWhAomUNGF6Y+0xu5Gp/QWJRYjvmqlhK dRQCTPRYKmGefvcpSPDJq3a7VGa03mL1EfPwUnxGrOjVruGiqayvLTf2+jDw2/HerbK4 YI8zJe/W/WaX90y6m2pJkFfAGTv9rpCanS2woH2h1YJl6NAJ1rRFS08Ef3u+6FwDFZdU Ed+QCjjWJFEDSYMO0YSY0cmAzHEnsASQ+rn9Lm5CH82Wy4GovQjutyFhXhZbhSw+ZAgP pr9Q== 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=8Gc7bKOoXxN33/CPI8T0rTL7M+GF505Zw8rzDI7VDhQ=; b=1JcprAg3Qb7p48pOn4Gemsm1w+ASZlzS9n//3j9Qqi6CTb7mRCnj//6vFJFj9NPK6c HqbSf6a2HUF2lF/djEa2G6XjSo7H11EcyJApi9ebbGZWNM2POOh2zZaztaSnfILfa4Yq M0wKBdQleTp1FrKzONsqXmKTJMX//HYIZ7yqip/0sU+HVfbfrFf+IHh+J1GwU6hb9YRS 9qyAseR2RiwzIza5LHxqsu4T3nTm5Te5a2jw3HEaKfke1upTGvm+Nq2Nfpt066bhZXyc rAJx8Q+nap18kjhFYykxoJ0DJkPtrS0B8Kfx21F/dyM2w84IcDHpeaIUDQktuqa7ZOTU kX3Q== 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 a3si298534ejd.575.2021.04.28.08.13.48; Wed, 28 Apr 2021 08:13:49 -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 AADE368A0DE; Wed, 28 Apr 2021 18:13:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A78C56898E4 for ; Wed, 28 Apr 2021 18:13:39 +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 1lblmr-00FMJ0-0I 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 blltlck78ljeHblltlNui4; Wed, 28 Apr 2021 17:06:37 +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=cwwbtKSeleFYVBYmjEgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:34 +0200 Message-Id: <20210428150636.28396-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/utils: do "calc from frame_bytes, channels, and block_align" in 64bit 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: 5kbizdYSZCuX Fixes: signed integer overflow: 104962766 * 32 cannot be represented in type 'int' Fixes: 33614/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-6252129036664832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9cee989098..e5e239fd98 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -733,25 +733,33 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, if (ba > 0) { /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; - int64_t tmp; + int64_t tmp = 0; switch (id) { case AV_CODEC_ID_ADPCM_IMA_WAV: if (bps < 2 || bps > 5) return 0; tmp = blocks * (1LL + (ba - 4 * ch) / (bps * ch) * 8); - if (tmp != (int)tmp) - return 0; - return tmp; + break; case AV_CODEC_ID_ADPCM_IMA_DK3: - return blocks * (((ba - 16) * 2 / 3 * 4) / ch); + tmp = blocks * (((ba - 16LL) * 2 / 3 * 4) / ch); + break; case AV_CODEC_ID_ADPCM_IMA_DK4: - return blocks * (1 + (ba - 4 * ch) * 2 / ch); + tmp = blocks * (1 + (ba - 4LL * ch) * 2 / ch); + break; case AV_CODEC_ID_ADPCM_IMA_RAD: - return blocks * ((ba - 4 * ch) * 2 / ch); + tmp = blocks * ((ba - 4LL * ch) * 2 / ch); + break; case AV_CODEC_ID_ADPCM_MS: - return blocks * (2 + (ba - 7 * ch) * 2LL / ch); + tmp = blocks * (2 + (ba - 7LL * ch) * 2LL / ch); + break; case AV_CODEC_ID_ADPCM_MTAF: - return blocks * (ba - 16) * 2 / ch; + tmp = blocks * (ba - 16LL) * 2 / ch; + break; + } + if (tmp) { + if (tmp != (int)tmp) + return 0; + return tmp; } } From patchwork Wed Apr 28 15:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp508638pxb; Wed, 28 Apr 2021 08:07:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwzGiCIro59VQeoOIlvDyBhxanYRJHJjIa5pjoKW1Tpj0WSTV5X8T+I0+Klp/7dIbnlBfi X-Received: by 2002:a17:906:7942:: with SMTP id l2mr29068977ejo.314.1619622469267; Wed, 28 Apr 2021 08:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622469; cv=none; d=google.com; s=arc-20160816; b=Y1WPriAPbKs42bE7jjh37+geFdBZoMs9J9OhjZN0sdmP6/QT4NZMRSqwp57sz+/4xf nmwZ2SbnFhk6dGEmNsmRgg4jtAttZR4OvbyYu9WL+QwkzuXVHQkHXs+T6sMAXDoyRT57 9xJnvTpEM179YGHdq/AcoTsl7BRJ74otMF7eoBkKdiMjcrOBJlrX/ttF6IqswPJXNfsX WoxqBPMWJ755ourxAFUlcbim3b09w0xYgbrSUCIxfvBnQBV/s/IynrG3tmqPcZXgrz1M DMANMEiCqdttzg9X6w8LncIv2tG9Ny6TjeTd9qrKS2wqqMdRuAy2Fs0ApPE9m5s8enYx vP+g== 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=j9jogPg020OlvhceSJzHb2dz4Rxno+Y54HcQfElswQ0=; b=g4q6DwQuHsvDJf8XVI4Mqt1GFpgjIwNf9YrMpPHYL5DyHjLoNyUKlxQQhvLtSTkhqB Nga5zm3IjrgFlqf5IUYv5iZgcfDT1dKR0pSvoe3glD7FNBJ88EGVldMGyciAFsHMaHe0 kxz8Q/sICPcGRYdY40ULTf3pJ3iHKOtQicFWn+8mrxXJezsW5aNPVAsIsJev2IDzrNfo gbOhjFdEI3WJzl0PhLWGe+XFbPvx93vcAubgJjyqYe2rzvVQrEgwADvaD5nSNlwnpPn4 WW6CIoXY5Cox9BxbnlVG0IKXB2QrwS46LeweRykszSMQ2twH4e3ZfeCIYDf+raTUqgY3 SX6A== 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 h16si6044725edv.460.2021.04.28.08.07.48; Wed, 28 Apr 2021 08:07:49 -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 2908968A1D4; Wed, 28 Apr 2021 18:07:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77D7168924E for ; Wed, 28 Apr 2021 18:07:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lblmr-00CrII-0B 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 blltlck7OljeHblltlNuiA; Wed, 28 Apr 2021 17:06:37 +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=tFWKVOVoM7f8wKKu_RwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:35 +0200 Message-Id: <20210428150636.28396-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 3/4] avformat/mov: Fix incorrect overflow detection in mov_read_sidx() 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: 7sigXkPjGMKB Fixes: signed integer overflow: 9223372036854775807 + 1442840321 cannot be represented in type 'long' Fixes: 33670/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6644379491106816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ca8f06c4cd..0f94abd040 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5080,7 +5080,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (frag_stream_info) frag_stream_info->sidx_pts = timestamp; - if (av_sat_add64(offset, size) != offset + size || + if (av_sat_add64(offset, size) != offset + (uint64_t)size || av_sat_add64(pts, duration) != pts + (uint64_t)duration ) return AVERROR_INVALIDDATA; From patchwork Wed Apr 28 15:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp508813pxb; Wed, 28 Apr 2021 08:07:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf7kOkprvG58w941ZHHxZO8q6y7zjcmw8qIFbisC4IXgW0BtrcqRVVzNURGmA/p+cDAbQW X-Received: by 2002:a17:907:16a9:: with SMTP id hc41mr30210953ejc.84.1619622479594; Wed, 28 Apr 2021 08:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622479; cv=none; d=google.com; s=arc-20160816; b=skenNbRbZXPXwlR/gUID7UcrjEsd7HJAmMxe1qjmlipIB3Zu8KYUt5h9gDWo3q8V7j vRlaN3z0L4CakKZqpeuzQbPYrgiOi2Gz01Q3OKoq+YAYqL3tc2gTAseb/VmkL2qGBur7 PHkbHxlCzDpUWfqlUq/6Vgy9QwNxMQyiwwkEGGI0m219HyniIwhTeGZMWk2BBjzxkFJS shfn9Wthlz4dFKlT4oP8NFbf6YE5Z4QHrnynEIRpPX8ttrvDDxaMZg3yI1vqmxSax9xY 5KugQsTyc5rkxwNJ0bd7EIXXbFYXpbfq+8Z9mYsR6OsYmkFXETrLnKZBMZzdLC3oedx5 +FUw== 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=FNNv1oHVFa55P+qZKzYQm89s60LmZOrTEmjikoBVk48=; b=j49u2XoAurV+xQI6LkAieGmIhDATbqbq5vSs9cJqHlIMD+Bc4tTk4BeQHYB0X7x6el cv7qjb7pVMamDoFXAsGOKmt12+pd1Lt34fX3V5WbSFwegxuGbDg3Zk9Rm+iKYeuNPUJ5 V1BfqeafrapISzMiCqEtToo3Z+O6X8gEKEPvHz1hR9jbsyOX5s7+puwUrize0t1pSkNj qSLhheFt7y5xCAG0dMJEkqT7EJdWiD/onurVlktGW6yWvIeeLPQD5poMwb7YGkdrHo56 ak2/1Q4UcdYTTTIGyIVxNSzMCdzWKKfx9WywdB8d6B5DcXKvnHsYMZiLKO8KXIntq3Sa grRQ== 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 bo9si276408ejb.184.2021.04.28.08.07.58; Wed, 28 Apr 2021 08:07:59 -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 29F19689815; Wed, 28 Apr 2021 18:07:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 728596891E7 for ; Wed, 28 Apr 2021 18:07:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lblmr-000bzJ-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 blltlck7iljeHblltlNuiD; Wed, 28 Apr 2021 17:06:37 +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=EMIBWudf3AdPlb-ZhkAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:36 +0200 Message-Id: <20210428150636.28396-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/faxcompr: Check for invalid VLC in decode_group3_1d_line() 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: jpc9X+d0+QnF Fixes: infinite loop Fixes: 33674/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4816457818046464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/faxcompr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index 7bf11d80ca..f1f7e67762 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -213,7 +213,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, run += t; if (t < 64) { *runs++ = run; - if (runs >= runend) { + if (runs >= runend || t < 0) { av_log(avctx, AV_LOG_ERROR, "Run overrun\n"); return AVERROR_INVALIDDATA; }