From patchwork Wed Nov 30 23:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1721305pzb; Wed, 30 Nov 2022 15:08:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6AdZLXnUFt4eVuyHcUZLsKwtSQJku9/5fkiIKA1s2gOgG4W4G2+565T++yoiXSZJJc+grJ X-Received: by 2002:a17:907:9616:b0:7b2:9f1f:48cc with SMTP id gb22-20020a170907961600b007b29f1f48ccmr37562563ejc.164.1669849734872; Wed, 30 Nov 2022 15:08:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669849734; cv=none; d=google.com; s=arc-20160816; b=l3DODl+5kG0xtzjGiJxw27lQFmweoqwuREQOYB0xq1qH1fZAqr+Hycb1gjkjat/zfQ Lw55i/BgqGQPxhF41DKJ97OTQqyaLpYBaPJnp5a3Qn/6ds+qxSf6GIdCD7xlE0iLvD0R bgrpL+OGXmcMsxPz4EVC/8MEU+7gh/6yPJisIZPVrAcE2rLXHH7f5OiHtRMGbl2cjN2w xDU47PNaFlvZq7GWu+hH/6Bl71mCG2rmLeCEFcc0urq5iIH5oUR6F4H0+NaR/1tcCGlQ Gd1Q6mVVLkckY2nJ+8xKlMlSuDNFYMIqOtHGlsK3z/VtdRMPXRyyrDMUSCMLs/towCxf mFkQ== 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=XahoVw78JPy17eQ6/J4yMwE6ESHp6GCnN4xsM2A/l/g=; b=aksJMe+KoveBu6TsqFi3wRr/mCeSdvSHjVHSgFU7YZ+gvI1fc3RavPaj5ayQF09us9 T6wP+Ii2j3TZDXwV4W9UqlKt6yNmrjP+/nTgX27GSI2QGHT1svIyCNzsdmLjt40tsoIi gYeUT2DDY5hyTVrhtvp0p1DiY6NriJ0DhIkwF9AA7DCucy+MV27BrS3BL2HRKh3yAPBc uhdzFF7+kNCee+3enEndUhPJxA8ABr/nsEa06zz7YIgfzyyjDDrZqVl04EzQ7h8rJWPG vxlcUzJNPmDDsvBYq0SSOYCoFoqM8Y5LC5UuEb7L6gvC4CxT0QnMvuTzX88pFEmRetIa Yb0w== 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 e13-20020a056402190d00b0046b00aab3e3si2532759edz.170.2022.11.30.15.08.54; Wed, 30 Nov 2022 15:08:54 -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 83DA868B7F1; Thu, 1 Dec 2022 01:08:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4685668AE25 for ; Thu, 1 Dec 2022 01:08:46 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 78BF8E0003 for ; Wed, 30 Nov 2022 23:08:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 1 Dec 2022 00:08:44 +0100 Message-Id: <20221130230844.30166-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/mpeg12dec: Check input size 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: O0q1KC6K05RP Fixes: Timeout Fixes: 53599/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IPU_fuzzer-4950102511058944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 914516bbd9..fb20e3c313 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2969,6 +2969,10 @@ static int ipu_decode_frame(AVCodecContext *avctx, AVFrame *frame, GetBitContext *gb = &m->gb; int ret; + // Check for minimal intra MB size (considering mb header, luma & chroma dc VLC, ac EOB VLC) + if (avpkt->size*8LL < (avctx->width+15)/16 * ((avctx->height+15)/16) * (2 + 3*4 + 2*2 + 2*6)) + return AVERROR_INVALIDDATA; + ret = ff_get_buffer(avctx, frame, 0); if (ret < 0) return ret;