From patchwork Sun Apr 25 19:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3374298iob; Sun, 25 Apr 2021 12:41:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylEvoqd4jXCn58jtUm5Lyb/gA62j27vNrzNXZWOHDac9+tfIbwLjUsqRgD8B/8Vyq7/JyU X-Received: by 2002:a17:906:fb19:: with SMTP id lz25mr14548934ejb.544.1619379704106; Sun, 25 Apr 2021 12:41:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619379704; cv=none; d=google.com; s=arc-20160816; b=sTTqbXwVvGl3fMq8wHB+RZlQLDi8NxqFi6GPihqlCUVFOnet3MgmLDTEjDKvKE1ajA xiNvlgvis8BN0X9Pq//7ZjteYq01YTvCi3BDL1hrJSe9MlgkZyEhUdZMipuk8oE6ZdBe 9quX9LNHITadP4fKDi2w7s9PRRnHaGJmV+lz9RSaHWx6oMTJC0ebMK32m9KAtXx+nEdg XIqmFzhS2ZzB7kw+bTebiK8IWJtKL1LhUHi6aGUobu8VbtqBcZBYG6weM1DJOUZxGxti REp6CBir88XDtmhFT8jEmV119JaZUCg46+JOGO1hsMGE9wArfmq4ZpdTywlz91wRS4cv IwCg== 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=yUhQu+m/wct9UTOxRFk+TVWPyR4vofV9ztqSIfA/8hg=; b=rSKWB2NnA3H4Ep4fzBXz8jSQ8OasItBpXljhaYEq26cxosY4Eq976stbGYECnK2Go5 3klbfR2uzQX0qrw2ByLPxn6B0OzNJ/JZuSmzsVCWrhMCdFJMKxbqRuS14WLV/jkLBBgi 9QVZN+N0WPNW1zuu3mRpbIxQi9sT7+u582rCcWTpTs6hfsl3CiICWckdHkJg1lt8RaPu peqEpmRK8ePxJMHGCjDsrobpp9HDefgLZZC+pxLTlS4ew8YTCNFR/mF5CVB0laER8mzm 0cL8M0XSxW1I5t1BySbRkBs6zTsNQAwhTFlKpsqcuRDGIcSY9urmvRyVAIkvLCClqSxV M4Pg== 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 f14si10827278edv.139.2021.04.25.12.41.43; Sun, 25 Apr 2021 12:41:44 -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 2F336687F13; Sun, 25 Apr 2021 22:41:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95252680CF3 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-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lakd0-004pld-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 akc2lFjbkljeHakc2lu0i3; 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=0QhkZZkUCceMK3EVKVcA: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:11 +0200 Message-Id: <20210425194014.957-3-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 3/6] avformat/nutdec: Check tmp_size 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: oZ15T3NzEfRM Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_NUT_fuzzer-6739990530883584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/nutdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index d1f3496990..4dd26c50ff 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -286,6 +286,11 @@ static int decode_main_header(NUTContext *nut) ret = AVERROR_INVALIDDATA; goto fail; } + if (tmp_size < 0 || tmp_size > INT_MAX - count) { + av_log(s, AV_LOG_ERROR, "illegal size\n"); + ret = AVERROR_INVALIDDATA; + goto fail; + } for (j = 0; j < count; j++, i++) { if (i == 'N') {