From patchwork Mon Apr 1 02:00:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp485859pzb; Sun, 31 Mar 2024 19:00:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGU2983yLOkIWpa60mh39LeSnX+JPhLGqS9Czvz1K+cljFBBKdqNAGxRfRpZopijLCwqc6uluvSt7f4vmgf/ZSFSS5hLvk+QJOCg== X-Google-Smtp-Source: AGHT+IE5OPaXGR4k0KvCZrq2RxCaZkqwSwfWPTEmBu2wVxh+v3OOqHnvXGbfUI7rT46vKk9AuscQ X-Received: by 2002:ac2:5501:0:b0:516:a0a2:ba1b with SMTP id j1-20020ac25501000000b00516a0a2ba1bmr2624803lfk.47.1711936818709; Sun, 31 Mar 2024 19:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711936818; cv=none; d=google.com; s=arc-20160816; b=q/uIQsWk5/0YtU9wtdYwe5uKotlMBLvPKGxws54aUce9TbgA2xxJ84G+zA5V99rbY1 9lHzBRsgGmTIu+TPtfLG82PvjcmhdfYTXqdvI+nWVpLEtSBZm8dmARk+JKqwn+SXKzff 2dOLodw1E/CphEfWsB6om7OPYZN9B4NYayg+cxQ5hJFr1dY5Xmm354cq35FTJzv+h5ey 3X8zx95Unyy0S4skD68LOQ8MvALU7PZbMZiXqzVL54cRYiP9F/cgSB3TSysPa7vMYu9X K4XZAnJEEDlr0U8+Gv3GDSN9rDQ4PvWG5YVmpCyuxTFb3QoUh60xs4tfnJG7r0u231o3 ui1Q== 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:dkim-signature :delivered-to; bh=lC3HaLSoanbjpRSDfR23HvCySPFm8+2OZgIjKhDbhLw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qq7LyF01Jd+ijGBe63wI2XVPULhYqVwZaZzUIre54w1cfwzZ0d/jWrDR0gNKpyEeSd 5/dBKd8FaxDscjPz/mf6VYQ094XYpflLo7xFp35FHhTKcVCrlO6hNDtXKwwbrg6dCJIr uA5/c633XfIOmHs5+vCbgjn0q40h8F3fbxcfguPIDIya/nHfSqSt0a/OKhFygKWEtg7e dhHcGGyebiQBomCwdiptgDyTXSiXptWBdjRFwwWcceh3fL+jbvyue2RvEUI/fDn3nYO5 mj3R7zGSyy/v1Depe/4ROg8dufFqaSkokAkndUnPAR5idLR/bFRx7WzgoaYvdlDJIX/2 dcPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=KMNBwxtM; 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 bn2-20020a170907268200b00a4a399a97e2si4294488ejc.726.2024.03.31.19.00.18; Sun, 31 Mar 2024 19:00:18 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=KMNBwxtM; 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 ED6F668CD84; Mon, 1 Apr 2024 05:00:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F57868CD00 for ; Mon, 1 Apr 2024 05:00:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 49704240005 for ; Mon, 1 Apr 2024 02:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711936807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=dZik98kfySRuK+Yk1Y1rGTDLBm/m3WsY/JGGUdBa8dU=; b=KMNBwxtMI8TnXQCJIa4xzr8RxXCzKTz/f0yCgGCR8aFYuXewhaOLhSkNzVfIGwHDDXJuxx mkzDwnaZBrclmwImtDR8TeUxLBgUDkJ3VX3NLzLB4QUbGAn64CveDA5do71XR5rZHszYRm 83ZWOjMm44KqT6fEfASSLu+mSpJLPVM5BSywKZBVULBcKRHoNfR5RoKez0bakp9P6TkO/e ssjJKcUepNgykieG4SGpl7wbKizcsqx8i3M4Yd0ugAvDdRSHZUzldCXaw0Xkm0u/W29qu0 Ioo1Fix97U+7Pww/CjJ9kk0NOESmLXvZq5EUnho51pA0fwH2t8Fp/1KePf2qbA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Apr 2024 04:00:04 +0200 Message-Id: <20240401020006.12107-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/exr: Check for remaining bits in huf_unpack_enc_table() 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: 66U/Opy7e99C Fixes: Timeout Fixes: 67645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6308760977997824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 0f1f683e7e7..09f2fca109c 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -335,7 +335,10 @@ static int huf_unpack_enc_table(GetByteContext *gb, return ret; for (; im <= iM; im++) { - uint64_t l = freq[im] = get_bits(&gbit, 6); + uint64_t l; + if (get_bits_left(&gbit) < 6) + return AVERROR_INVALIDDATA; + l = freq[im] = get_bits(&gbit, 6); if (l == LONG_ZEROCODE_RUN) { int zerun = get_bits(&gbit, 8) + SHORTEST_LONG_RUN;