From patchwork Sun Jul 11 13:26:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28885 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp2124134ybk; Sun, 11 Jul 2021 06:27:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBsiROP10QiJyeVUVlwZFoTstQTAbH2WutrNkDHVlTbrd6wRyXvyMcyiho6EGhwAATxDVE X-Received: by 2002:a17:906:c208:: with SMTP id d8mr48416158ejz.67.1626010064665; Sun, 11 Jul 2021 06:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626010064; cv=none; d=google.com; s=arc-20160816; b=WxqQeiv3aeCdu5mhTrAabRuLgU8PJPnoNW7JG63u4f7NXmWHRdlgV2fX0rZIVayhG5 kI23yU4H4Sqkepm58rIRVoLbbdEy0BxscvxkAuP8EJ1xd4UkcXmtaYnBSLa9WpBRxuBN CitWTeUbEtE7vb9vw7bNtHoaHv+3ElL00m56jTHLXnmpR2YJjAkBOAZA4dN2VbrNu+PX F98e3zzEAD6wIqYviu70Kt0uqUhcPlyPGJm82sx5R4w7imoGoakceyHt+Z5e9oDiEx/D f9idNLbO+qQ1UimrkRpFJ7MiDjjyWIQu1j61D0zF+CcNP1u/AJiM0K8mAOL2pn2AcZc7 vOZw== 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=1yFWcm8PYf/acNoUx78/+IYiifNQmaiGhyBSV2KHnxA=; b=cM56MN6vEffGNR7ltmnAhJeQswo7hevtNaLIBhYzvM2G0H6Y0nknxsq/D4WBWcbwhI NSGCyzICCtcMbaZp2NdmCl2QD8PVZZ7cKKjo7u0t7kak7DT0otB2ntPJ/aitPPRJbbaX ZiJyqIQbXkrLULJZDvCXjlEFNEb91qjLgYC/vBlHxl2I4O3kMsenlQ3MP6FfoTSP7zok OMzLybyTKWXgyYAQbJz2LbU1E3+p+48GrSRRcQdPLwEUhh3Hwo2vqCUuXnKFrtbOzUWR mHQWgUo0YJdHaSrSQ3WsZ6EWHw/Y7hk6oAvVofJko3DJSIFhsBSqcq7yr1m7bUMa0yRT 5/jQ== 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 6si13518486eje.347.2021.07.11.06.27.44; Sun, 11 Jul 2021 06:27: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 18491689D21; Sun, 11 Jul 2021 16:27:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D92568A36E for ; Sun, 11 Jul 2021 16:27:34 +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 1m2ZUc-00GMRw-0G for ffmpeg-devel@ffmpeg.org; Sun, 11 Jul 2021 15:27:34 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2ZTemD09lljeH2ZTemFsi4; Sun, 11 Jul 2021 15:26:34 +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=J4JQS-s5UiaiBASPXEQA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Jul 2021 15:26:32 +0200 Message-Id: <20210711132634.14829-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfF0z9j3CBYele1xBwquDFFx27G4meQL3fTTKSx3ireyAKzBU85iOZRNztA/4tyN3csCBC75EuCRmQ0sf7ZatB9By9siPqnXAm4Js2NGEOXGHlq9pVZit Ch12u8StrrDRGh/7mAzynLb59PpTF6wNZYLWtC9aQ5DRbdP5uaKZAUhI Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/exr: Check uncompressed_size against max_pixels 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: HTwaEdTQ3t0R Content-Length: 1288 Fixes: Timeout Fixes: 35286/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6557139802914816 Fixes: 31253/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-4901782326214656 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index e7387ffd66..f7d59c8241 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1299,6 +1299,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata, axmax = FFMAX(0, (avctx->width - (s->xmax + 1))) * step; } + if (avctx->max_pixels && uncompressed_size > avctx->max_pixels * 16LL) + return AVERROR_INVALIDDATA; + if (data_size < uncompressed_size || s->is_tile) { /* td->tmp is use for tile reorganization */ av_fast_padded_malloc(&td->tmp, &td->tmp_size, uncompressed_size); if (!td->tmp)