From patchwork Tue Jul 19 11:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1687483pzb; Tue, 19 Jul 2022 04:37:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1skuKTSAK4D7mzrO5zGXSsHPYowp7juq2PLpU4HZtGseLpgtf8f4eJ1z3qb8jnAG8SBGFHX X-Received: by 2002:a17:907:7e87:b0:72b:4af3:bf57 with SMTP id qb7-20020a1709077e8700b0072b4af3bf57mr30498725ejc.9.1658230623738; Tue, 19 Jul 2022 04:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658230623; cv=none; d=google.com; s=arc-20160816; b=ikBB2wCMaUEpfv0sUtkQKeV9teW+rmTB6Hdob66ugLtfWrG4eKNgDMjckp3qTGc8Qw Snh7T7L+8TFRxCtvnARSRSGCByMh++XOgo0IaR2iJFqzVquBxTeaWRzCQT6FgvtvT0j/ P/89bpVJrgVSo/docIhUotzwrcsiv8AKj6eugQmo0dE3uEy5SubxL+JkaUiiRUz+k01/ GUqTuKVZ94x/yVVLVN74vvS7qDku/PL5hGNt7RO/LXzg4OOAsuTqB9QwOFqUJHUPmyg1 xfm1v9AyJ6B/ciayytX8eYN4oK/pwI6tfLMVeMllnwO6v5cfUNDwe1SlRMfSJnwc85A3 VMUg== 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=xLvBXMmL1Iz+gxoD+K1rE72FFjPJ57aLfbSAYVp9T3k=; b=UluiPv01VR9DgEls1nDDeM2/kOvzXM3AoOR44g8XhY+M3dzCQO7R1HJ68tIuTeqzVB H0l1fIYjdP0H5iNmzE6wSZmwMO9MJLBJ0UgEJFynRVTpglFlOYkDz85hIX8ETFev1z9W Upy276XO9J9hjxj9MgM0iQXlMoTWyD1h0RFzVALRffhX9pSbXth82QKKNYGoK3OjKH1v wGm4PTAEhUSNBQkOY3mLYoss12hmk1Y2NrxXTMNcagUFWijaziJYJyNZMqJ+Vt4lXUwc phyIKiOH8Geth7YcNHlfjuMkZb3SZrEgmnQ0WwSZRkLibt+vkbq/X1M//HifsxK+vcc7 RGVQ== 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 k6-20020a508ac6000000b0043a83490a4asi18092300edk.498.2022.07.19.04.37.03; Tue, 19 Jul 2022 04:37:03 -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 9138A68B641; Tue, 19 Jul 2022 14:37:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADDE268B61D for ; Tue, 19 Jul 2022 14:36:54 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDlX4-007H5N-AD for ffmpeg-devel@ffmpeg.org; Tue, 19 Jul 2022 13:36:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DlX4op9rz8s8UDlX4oTpdn; Tue, 19 Jul 2022 13:36:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DlV8oZiz1OPqFDlV8odV2L; Tue, 19 Jul 2022 13:34:54 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62d696de a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=GeJhdV6fVz8uRQgnty8A:9 a=0rU6oQn3ptO-wBQ8u6O6:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 19 Jul 2022 13:34:49 +0200 Message-Id: <20220719113453.23169-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719113453.23169-1-michael@niedermayer.cc> References: <20220719113453.23169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNjgmC1e4BE0tX/TNCtVeeEKpoWg3k23kFselcpXWHo+dwpmE6iHlFmbMgfvTuc+GmYre9YBlj13AapCZXCGOJRS7YQeJ24JHkPaYgJGnwCetQxtRfDC is2xQZrkHH6QPRflkMOeuPKO/qhI5N1dVMqnfZEnrYwU0b5Jvr/C8vtIbg5CYDR7KLhD8iqY1+7ivw== Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/exr: Check x/ysize 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: K4ggM6aB9XUU Fixes: OOM Fixes: 48911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6352002510094336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 8cd867a32f..c25bae8cd4 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1241,7 +1241,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tile_y * s->tile_attr.ySize); td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tile_x * s->tile_attr.xSize); - if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX) + if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX || + av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */ @@ -1265,7 +1266,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, td->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1); /* s->ydelta - line ?? */ td->xsize = s->xdelta; - if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX) + if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX || + av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */