From patchwork Sun May 1 13:37:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35531 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1340488pzb; Sun, 1 May 2022 06:38:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTnAxa+HFAaNj1sugl2J4in6H7Reqr7K6aOcra8bNfwlmpo2SxRgyvvC0qlBmI0MfSJc4p X-Received: by 2002:a17:907:2ce3:b0:6f3:e18e:b7b with SMTP id hz3-20020a1709072ce300b006f3e18e0b7bmr7539489ejc.28.1651412312510; Sun, 01 May 2022 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651412312; cv=none; d=google.com; s=arc-20160816; b=a4zo78FeADOqu6CMu3i0FEzDW5A3F+zlCom3+zaU9qoYloB3EmFOKaY3lStfRlht4C qyJ2nBI84+AWD+fatqAu2JI6Wf/ta81lOmWHBgcxjzGb4Py4hkNGuqHlSg3R/crh06KV W/f8cRIch2vCWVXIl7GLI68K88g3GtGwyK2LBhQu+hwP16JNMx3dfi0btTHDq6y48dYO 0PZbMt+IrtHNfyhiuVzPqnLh8Zudhl5d559ojqPziMdVPuxE5xZUXBed8Zb5Ly0MDxd9 vyF2bVTbdCn7bKfufXS41bdGw37lugTOS2ynRvO9HFqqUT6CudGk8z/vvDH8HhjXAbbP rfiw== 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=cwhSoWJK6EcTO7FyTrGO9T/gWvThZfpQUkjw8oxHzTM=; b=nks6BDKfhdDraF+pAskNBNsCa0UNn03xgNTIVF6GgtGF4utZ9S/jij17PWksjXvbec NRc0wvHBYZ/zqFteIRDEg48X8AnVP3+Aov1CVA0a40FbTqpwaz3Sqikxtr9gdPHoucKx bN4V+4jMJzr4CTL/smcJ7k1nbjNcjSP/0VB9eKYlu5sVe6jHi0L9Hz69MYHoc4FQ+aie 11snTpSIG8wxIRnrZSuZnViLXp5+Suiy5LRY0hUFddekS0b/RJGXwwgwJJPM4Zz7oCCo 9t74pi4lY8XdEN7x6w7zmdzEdCpXNsuLO6ger10lm8UvsEu97oQt8llpZTR+sg6gqgld k7wg== 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 x4-20020a05640226c400b00427ba3b443asi1762883edd.126.2022.05.01.06.38.31; Sun, 01 May 2022 06:38:32 -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 D9A4B688093; Sun, 1 May 2022 16:38:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (unknown [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F4BF68AC70 for ; Sun, 1 May 2022 16:38:21 +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 1nl9mA-0005hI-Bz for ffmpeg-devel@ffmpeg.org; Sun, 01 May 2022 15:38:14 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id l9kEnftrLSgGFl9mAnALkF; Sun, 01 May 2022 15:38:14 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id l9lun4Q8g8eSWl9lvnd8CU; Sun, 01 May 2022 15:37:59 +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=KKE5sHJo c=1 sm=1 tr=0 ts=626e8d46 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=IuIF140LI_OfWIKdIfQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 May 2022 15:37:58 +0200 Message-Id: <20220501133758.27115-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNGp+JQr7eCtuhFKspWJQ2qhIoi9EFljvHesz3pfUpESFQ/NqWIe+axv/vZRZPQr23MD0wEp00/EntxPoB4vaMmzrYXHbie/zed9lOTp7fHk//wCtzoi M5+BTqN+tMTtTFGdR8TVB/JY85rspE4W4756jVzPdZntuPWqm/F3xE/uacakU5jLPnT0HgQuYeSWoQ== Subject: [FFmpeg-devel] [PATCH] avcodec/pixlet: consider minimum plane header in the minimal packet 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: 57PRmvGioDZ5 Fixes: Timeout Fixes: 46956/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PIXLET_fuzzer-5698161106092032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/pixlet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index 18a6587257..b16dd4aa87 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -611,7 +611,7 @@ static int pixlet_decode_frame(AVCodecContext *avctx, AVFrame *p, bytestream2_init(&ctx->gb, avpkt->data, avpkt->size); pktsize = bytestream2_get_be32(&ctx->gb); - if (pktsize <= 44 || pktsize - 4 > bytestream2_get_bytes_left(&ctx->gb)) { + if (pktsize <= 44 + (NB_LEVELS * 8 + 6) * 3 || pktsize - 4 > bytestream2_get_bytes_left(&ctx->gb)) { av_log(avctx, AV_LOG_ERROR, "Invalid packet size %"PRIu32"\n", pktsize); return AVERROR_INVALIDDATA; }