From patchwork Thu Feb 22 03:35:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7707 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp1555146jai; Wed, 21 Feb 2018 19:36:14 -0800 (PST) X-Google-Smtp-Source: AH8x227Zx2pvIh7gv/4kfFxMlr5o0k9nG7me8WkLwakaSijjQZYntZEpmUM/xMY5RLx6iYfqe9Cp X-Received: by 10.28.62.70 with SMTP id l67mr3435216wma.59.1519270574214; Wed, 21 Feb 2018 19:36:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519270574; cv=none; d=google.com; s=arc-20160816; b=uoZu1NT2voaApf21eSvG43MfaaEsfozTG4XgXHZABL3wz3dnx4V4pIPNQWuQ/yknrb ueBz51bqUGKZZpN1agzoB849BfW3IKLInICR5YszTushLKIwrKa0ds/eoSMWBNlsOx6E 6fB/ToylrtZHMgljdqAwE1teRRo9d7KqHXNqZeBZIiuqHujSJx//zThN5LU2AyvA3XWG RTxdmCv06HLhuqn+pyThGPfW3TcWk92waKdipdtrX/sA6X+gMSQLs3C/BUdrsQA8ihVI 19EriUANRk2fLEF9o3WiVj3DstkSnGpHxp39/XZPefsyWIjwpEJACWqEM62VCJ6pRipF Jygw== 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 :arc-authentication-results; bh=i7USl3M7YURssC5SHUSNdywQ+q1Xc+5HwwUi0BlOTG4=; b=XBaMSJuVSiuoJ9fpfX/PDVigJdNkvX5dLDDl5b2MhUFg/0D1Wxi8HOptOWw3Gi/qrk AOHLO0OlXMdEKJpH4xFutCQEe1Fr5WZkzm3M9kMfXkavnUcXwgsH2vcNglBtknnTBkbe nMjNWO+g6LXXlKcaN5D9gAxiYhEXch/87sVyuG73ROCeBe9NX2MQXzQRQFqvnQFjbC8O 2HFe3Ot4aM/2ogLbMxSZBST7gCOx+TEDOyDV96H8XjR8jUvIunWyuTCmoO6VGdlUCK7j aQTxNtAQcPcp8BpAymyBPvJAGkJU5xpUIO5u4C6aCLu8reviYrDuIU/dDV1uTcECTDDe nTTA== 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 p38si20340665wrc.266.2018.02.21.19.36.13; Wed, 21 Feb 2018 19:36:14 -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 A53B668A521; Thu, 22 Feb 2018 05:36:03 +0200 (EET) 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 CB07268A519 for ; Thu, 22 Feb 2018 05:35:57 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eohfr-0001Ph-5Z for ffmpeg-devel@ffmpeg.org; Thu, 22 Feb 2018 04:35:59 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Dfbr1x0160S5wYM01fbslV; Thu, 22 Feb 2018 04:35:53 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 22 Feb 2018 04:35:50 +0100 Message-Id: <20180222033551.17031-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/g2meet: Check tile dimensions with av_image_check_size2() 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: 6216/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-4983807968018432 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/g2meet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 842095ba3b..a46157218f 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -28,6 +28,7 @@ #include #include +#include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" @@ -1451,7 +1452,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, c->tile_height = bytestream2_get_be32(&bc); if (c->tile_width <= 0 || c->tile_height <= 0 || ((c->tile_width | c->tile_height) & 0xF) || - c->tile_width * (uint64_t)c->tile_height >= INT_MAX / 4 + c->tile_width * (uint64_t)c->tile_height >= INT_MAX / 4 || + av_image_check_size2(c->tile_width, c->tile_height, avctx->max_pixels, avctx->pix_fmt, 0, avctx) < 0 ) { av_log(avctx, AV_LOG_ERROR, "Invalid tile dimensions %dx%d\n",