From patchwork Sun Apr 16 16:48:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1839093pzb; Sun, 16 Apr 2023 09:49:44 -0700 (PDT) X-Google-Smtp-Source: AKy350YatDG6Q+0GEMqhOrDkDm7dMzCd1KAeWIoeeBq6FSkps3tpxLUuAIDPLtQTih9UWXS+TBtO X-Received: by 2002:a17:906:824e:b0:94f:31da:8c38 with SMTP id f14-20020a170906824e00b0094f31da8c38mr3633390ejx.24.1681663784277; Sun, 16 Apr 2023 09:49:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681663784; cv=none; d=google.com; s=arc-20160816; b=psZYvS7AqDy3kFz7bXRIheR/VzG8RdCOnbk3OzBHexgJrE2Sk79I9kotcNXD0exHK+ UjGOjviOWrFUIptiv5Fn2COvd5XPFjFZnwL0qpYbkpS/m/LfP3DVA6aj0NpMbXIoEDgq Owaq3XMmL0Zbm7DeLD2W75THAQ+Cu5cYcm4XD+h/L2t92kgrrhDmTMIuDHTNI/VWg4Ho 8zOWLSo95FbU1Jg8Or1NUltQjDAUZ3ysq5FkZHg908vEuBOTY2aAXns5F333D6yNiEvD wWmN4CBx/Bjj2WSI75TjOGGxqBn7/EGPqbfRWsRZB7ndkpwthwjDlgTBrerpPC71QwDQ j+hA== 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=mjmL3qZhUm5dDTxpdK9oPQz8mpwYzRLedOTKvsHxdUI=; b=bQVF/tK4OSf7FgXkw8npVjH9UA3qvbXrY/Q81zpqfIBHJMmuVI/bWRSsbLeTtw4YJ8 XibTNvaEXl8+KgQZMHyKEVgTrrlCT0s2wZyW9UfWlF0ilJHv/jYLNT78F+gW2xSFm3Jb fMjSDLRY2XW8seZLVXnz7T1TlDek+tj+IMOnvygGKDukjxu/YuyDWfw8HkGx8i5EeYQa i1m3hgSZ7bJBCOzg1UG65ofDzs342weOgLBPIPdtwpEQ7ql+fXHTiSRvEBZ4CmnfSzGS e7JYQLkj/XrszBDL5Xx9hMNsbnrz/IyKtPrpxvohr8lEAiQkNsmC9c5P05GAiEgg1rYa PSEg== 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 lc17-20020a170906dff100b009332d9b2a96si9085588ejc.955.2023.04.16.09.49.43; Sun, 16 Apr 2023 09:49:44 -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 61BF468BE49; Sun, 16 Apr 2023 19:48:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05D6D68BE0B for ; Sun, 16 Apr 2023 19:48:50 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0806AC0006 for ; Sun, 16 Apr 2023 16:48:49 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 Apr 2023 18:48:27 +0200 Message-Id: <20230416164830.15664-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416164830.15664-1-michael@niedermayer.cc> References: <20230416164830.15664-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/tak: Check remaining bits in ff_tak_decode_frame_header() 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: u+8G9DRAV8sB Fixes: out of array access Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-6682195323650048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tak.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/tak.c b/libavcodec/tak.c index f26574c968e..48fe83381f1 100644 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@ -169,6 +169,9 @@ int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, if (ti->flags & TAK_FRAME_FLAG_HAS_METADATA) return AVERROR_INVALIDDATA; + if (get_bits_left(gb) < 24) + return AVERROR_INVALIDDATA; + skip_bits(gb, 24); return 0;