From patchwork Sat Jan 13 23:39:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7280 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1167466jaa; Sat, 13 Jan 2018 15:40:18 -0800 (PST) X-Google-Smtp-Source: ACJfBou8SXlPAkXF8WKoL5DHZoYnjGx0FmfvwO40n6gfnaM3ZTWEw+XTycRv3PsFxBuuB0HLenIQ X-Received: by 10.223.161.12 with SMTP id o12mr29173508wro.243.1515886818906; Sat, 13 Jan 2018 15:40:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515886818; cv=none; d=google.com; s=arc-20160816; b=VYpm3vVzEBv5zLOptH6S0hXpQpDiPSAuYfk+2+9Une5OX/A73QM2Y2dOvpjx0ptgso TbhLBxf7sfCvdseQnaEIoPiLkQ8Yq02WpUnok4heblDnxH4qx4atFEgv2KPZ4xoImY2B n3rr4cE7gwGyF2vjLEk7ksVysdRlpVcU02h5DUL235Mn8oXBH1EbNaEqBK1sey5iCn/R d71u6k5U1zLxC6sWlUYdL/STAKwtAFb8dca/TTqsHP+D+QOogmrDXt1+FAJusDxIiKhO w5zmoCndEVhbYB4yrzrhtm4aK3xEXvpaM0Ka0cnDx+/XdR2bboL/1Qq+7llNsIrZ2MC7 K/+A== 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:arc-authentication-results; bh=NA2RjNpURk6jBKhefFFm8fjEFNIPzbFkNNJXzzcZxYI=; b=K+c+d2en9B1Fa0h4e8mZfxwZpv9ZyGlP4g6RewZa7RBhpxibMH6Wf2K/KgHovHavJV 9Y6KWg0Nx4qQMqe3HFgSrNYE63qtPg0wUBgzqPr4LzWYrEYoNcLYNiX4xxm4TCEf83oa L3sutOUhxMydQpn8207wv55rF6acYaiDJf79svR/QGrKMRrumkhuQdgE8+kjGHvRQh0i hp8aLMJ4V1WUe62gLBKy1gc7MeEvN9iFpgHsADB1MglLPHeoi8cORJoCxnttgzgFQJCg +Q0oNgnFgaq4p2iYe0O9MbhrBpLVua7ti9dA6Lbae4fY2cZPKEhx00imbpqLqrV8UVzY tdGw== 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 a72si1787168wrc.311.2018.01.13.15.40.18; Sat, 13 Jan 2018 15:40:18 -0800 (PST) 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 84194689FC4; Sun, 14 Jan 2018 01:40:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A216689FAB for ; Sun, 14 Jan 2018 01:39:56 +0200 (EET) Received: from [172.31.218.41] (helo=vie01a-dmta-pe04-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eaVP2-0004PK-T8 for ffmpeg-devel@ffmpeg.org; Sun, 14 Jan 2018 00:39:56 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eaVOx-0005oO-5a for ffmpeg-devel@ffmpeg.org; Sun, 14 Jan 2018 00:39:51 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id xzfk1w0050S5wYM01zflxN; Sun, 14 Jan 2018 00:39:45 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 14 Jan 2018 00:39:40 +0100 Message-Id: <20180113233941.9407-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113233941.9407-1-michael@niedermayer.cc> References: <20180113233941.9407-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/jpeg2000: Check sum of sizes of band->prec before allocating X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: OOM Fixes: 4810/clusterfuzz-testcase-minimized-6034253235093504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index e7f03bd0df..8e90980976 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -541,6 +541,9 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, if (!reslevel->band) return AVERROR(ENOMEM); + if (reslevel->num_precincts_x * (uint64_t)reslevel->num_precincts_y * reslevel->nbands > avctx->max_pixels / sizeof(*reslevel->band->prec)) + return AVERROR(ENOMEM); + for (bandno = 0; bandno < reslevel->nbands; bandno++, gbandno++) { ret = init_band(avctx, reslevel, comp, codsty, qntsty,