From patchwork Sun Jul 3 00:31: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: 36620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1932947pzh; Sat, 2 Jul 2022 17:32:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t0NpkegXj7Smwp/HE7oW9XzQgLxKl1uh0CiqJzIugPxwuOL36cStZu2Xi93reNw1FppFPA X-Received: by 2002:a05:6402:3224:b0:435:80fd:333 with SMTP id g36-20020a056402322400b0043580fd0333mr29147681eda.76.1656808353970; Sat, 02 Jul 2022 17:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656808353; cv=none; d=google.com; s=arc-20160816; b=FE73gYESY/NB0wEhSqCsONLGHCXgudtdjNVa38Uotxz4vKzPPTSM/jAfaTAjnCwJBa xdlYgK4uv0GnjOXLrlf/UDyXSRoFwNz34PDuo/ZnZnOF12DWlVcythv9s9pQYtSfWGeI wyyxNc5z1B/OmXXYSpI/cNdfDJoqv5+nRqHcB2tOLsjIJ+drx0p6gSvSfFrnCXWLRYSH MCINH4izCiQ4ijeZJ4nYwZ1D3CssMoXIalMN9p/Edky8g0CV5irnwMMEYODrNNNtyRfV 3ywgTJqPtRy6PoGFcgWpveZvvAuFsXwXynyiwckcq/MO1eB8uURGD3ZazJ7Oh9ZAEKKE H8UQ== 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=J7gTbR2k1PTc+AKocn+oT6ndJIm9xrJLN9LGtqYNH3U=; b=bR8nbS3bbzn6+rUuHbdVMCZuDlPAhtQ3dp1d4CChsTsymqphVKNsAvB6PEVIPuhnkZ lMuVYl585PA9E7d5KfUyfKtNjm65dAEBiUR4pSFBqDOgHYBg5sRibNoEcMQGqEFdk+tJ OSJCvnelY2uJFQLzRCap93PQZVjOVOTlzKw9RIP841FC/hNt3EYvgLDZMioJM0fEnYkd A09LfaD4gV9ZVqRL/qUqBnMjOj+WIvGIbbhC+xKjf2KZl3YiWp3hWpPfElGzhUip5NUK gtNxxDThZiVm5nERuVaWTJxlDUdxTetQ3pSW+UGkrn8vibVjTiGaJ/NcJMsf59rluVEy hr4g== 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 d6-20020a50cd46000000b004396de7fe60si2791799edj.270.2022.07.02.17.32.33; Sat, 02 Jul 2022 17:32:33 -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 328DB68B98B; Sun, 3 Jul 2022 03:32:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B59568B91A for ; Sun, 3 Jul 2022 03:31:55 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o7nWk-007Kcf-5T for ffmpeg-devel@ffmpeg.org; Sun, 03 Jul 2022 02:31:54 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7nWho2w3A8s8U7nWkodISE; Sun, 03 Jul 2022 02:31:54 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 7nWkoo2P8OPqF7nWkoC2pG; Sun, 03 Jul 2022 02:31: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=62c0e37a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=N9NeYqRwPDIubM9dBHgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Jul 2022 02:31:49 +0200 Message-Id: <20220703003152.17850-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220703003152.17850-1-michael@niedermayer.cc> References: <20220703003152.17850-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEOAgD7e9tw/8KH2kXEJ8lM8OfhhDZ7URSsJM/IipA01s7IWuvDFWyeTvjkQT9k3IHYsASLfrOxjNejhV6A4FZIzta3wwyQjlYqLqSV1hA9K6QUNCCrl V/Egy8bYp4FvJYh3OAOToqwhUjhitmR3HDX3j+rBjEpBtKfLGCyl/5u5HrJhBD1VOaudnoxY4sO0KA== Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/mss4: Check image size with av_image_check_size2() 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: ZxRFzEfI+2H4 Fixes: Timeout Fixes: 48418/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MTS2_fuzzer-4834851466903552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mss4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 9f3c4a593d..43eb1025aa 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -26,6 +26,7 @@ */ #include "libavutil/thread.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" @@ -477,6 +478,9 @@ static int mss4_decode_frame(AVCodecContext *avctx, AVFrame *rframe, width, height); return AVERROR_INVALIDDATA; } + if (av_image_check_size2(width, height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx) < 0) + return AVERROR_INVALIDDATA; + if (quality < 1 || quality > 100) { av_log(avctx, AV_LOG_ERROR, "Invalid quality setting %d\n", quality); return AVERROR_INVALIDDATA;