From patchwork Sun Apr 23 22:32:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41307 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1041208pzb; Sun, 23 Apr 2023 15:33:24 -0700 (PDT) X-Google-Smtp-Source: AKy350acHx4ER1AXUVAJ3BphbkbUlsabM05p/CT2b6ebtNqNlO2w9VrxuomQcv5UfoakcOLZheTH X-Received: by 2002:aa7:df0c:0:b0:506:925a:c224 with SMTP id c12-20020aa7df0c000000b00506925ac224mr8779369edy.38.1682289204581; Sun, 23 Apr 2023 15:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682289204; cv=none; d=google.com; s=arc-20160816; b=aj2VvePUXbxDznA/NyxZbCokn8AcL6XHToO+B5PSh2jxa//gQJW9Tt6mucmuwErny9 lDcqaninD0K3brzoDe+7fsCkjwz+E7U+GSX6hoKx7HBpIfE3j6ixTO6udCxaxIflPaVM mOdU06JOO5Ctc8C2i51M00m8E1elq1AtZr+zCRVxzrNeH1quRihmcnCRXDmQv/r9esvY smTTVQdjWOUBXOG0vOZFRpmKeW0GJ6pDgLI1NjynUIgl+v6j/YioF4pqkX4uZyoxQQ1t Cndht70/dEcDUhwiMm3kx6zK/RDez9an+vLQYzemuH98YR74ThLHM4cW83in+0iHRtkF oprA== 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=ETTjrTZtjSspnJqxSJFYDhVKOruNd92t3ofZzSMrJBM=; b=ZZ1w3iHpj/rFE7BkVm3HiIeDDnbdAjPiY5h9lFBRgii7BTPbh+wYUXfyZVfF4D9zZE 41o7X8BU+AIybAbMoun3XV/U2o26/9I2Q5kkmweZZJBLbKIuysr1pvmxM2ulIfR52vaI O1rBblt4BmqXtU4mBSKzeDaXZqObDfLNcLiOqZRUUFH0fnd3t76Gwb3KKV836Ez/L8dS 5o5Q9TOg57CirK69mD9WJWb4zsdfAOr9FvKg3JZZ2diaudYu1CSdZIWCr0D9yMRKhtcI rFyd+lTGN1jldETj0cmjooFE5Noj5YDtokgoMfJKp0jmeEPG7nHx7ei4QpaGdu5sqYfG 6Y4w== 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 c11-20020aa7c98b000000b004fc43a04debsi4615719edt.294.2023.04.23.15.33.24; Sun, 23 Apr 2023 15:33:24 -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 7F27568BF91; Mon, 24 Apr 2023 01:32:50 +0300 (EEST) 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 8152268BF75 for ; Mon, 24 Apr 2023 01:32:42 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id CF5FFE0003 for ; Sun, 23 Apr 2023 22:32:41 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Apr 2023 00:32:35 +0200 Message-Id: <20230423223236.375-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230423223236.375-1-michael@niedermayer.cc> References: <20230423223236.375-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/cavsdec: Check bits left before picture allocation 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: U7/Xw9TY+TXH Fixes: Timeout Fixes: 57893/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CAVS_fuzzer-5091726540013568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cavsdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index b1fa9a981d..37071dfbc7 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1020,6 +1020,9 @@ static int decode_pic(AVSContext *h) skip_bits(&h->gb, 1); //marker_bit } + if (get_bits_left(&h->gb) < 23) + return AVERROR_INVALIDDATA; + ret = ff_get_buffer(h->avctx, h->cur.f, h->cur.f->pict_type == AV_PICTURE_TYPE_B ? 0 : AV_GET_BUFFER_FLAG_REF); if (ret < 0)