From patchwork Sun Apr 16 22:25:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963529pzb; Sun, 16 Apr 2023 15:26:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aCWpf0XwQHhhpOOJvwtJnW/Y1Bj2Gun7sLnTDGdaX3e0sFolZcgcaqqrWVnUrJDhqZiH9N X-Received: by 2002:a17:906:3495:b0:94e:8aeb:f8f3 with SMTP id g21-20020a170906349500b0094e8aebf8f3mr5195857ejb.57.1681683963894; Sun, 16 Apr 2023 15:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683963; cv=none; d=google.com; s=arc-20160816; b=v/lTnUWVDpE4BkO3uvODXs42AQVSnAkPlUIRB5nY3xvn8WaQOWq+GvzPQmuT1wc+dU kDjHT6eSwaQFWGCTZ+1h+/hPldy89PdiX11AbrPxyxpc7yrmLMmhR/2hbiVIukLXWkZj 8SmLEynTNrP3XAsp0gs/7YvOd/B+JSWDeRDgL12uWzFXbSY7IoPg2KtqOUE4ZfPdQcJz sPYH6Qm4KdSGLExUZVQHRfQ7YPNyXEKvhJu1jiYP0wVseHYUj5ldrunUh4km3o6MS+up MKVAPj7a9C8xa65K3RP09+q3wa/Q3hlKOOIwni1ikx2GTz2fDiAxCLTkSujnuBK60E2c 4JXw== 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=foiZfqi/Vg5T23OV8DDElI+Jjm1KW7CWg8wJCp1POI4=; b=lhhRfRvzknCnArfLeuTrCm/qz7TzqFxkWa4ClDexr/71++fHih1Qcs3cjwPYugXXqc 0gGXfqQATbpWLPpCbVZkqolkXybP9oGAwnqbmjAloBDj8kIZ0lIh+4QmG695TKWTPRxT q6yYjx+5mNJSqTkOWwNNBnXFExwBkC+PuF5MUkyg745fIsWDyKVdpU+ROe9E0Q5mlPqY SxJrMxJtf3kkgePFV5G+d570OnEvTf2KbVQUh+d41xNPq4uXb+NTAWS2YPC6j5Um2XVs 4cFaIeYoCMJW0g92WFQ6AonDvst5L01WzqwlmdNMQ89EABfvPUaXz6ptaIp08JabyuVh 1ndA== 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 we16-20020a170907235000b0094f59407d46si1362387ejb.522.2023.04.16.15.26.03; Sun, 16 Apr 2023 15:26:03 -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 1F8B768BE10; Mon, 17 Apr 2023 01:25:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC03968BE2E for ; Mon, 17 Apr 2023 01:25:24 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0830560004 for ; Sun, 16 Apr 2023 22:25:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:18 +0200 Message-Id: <20230416222518.21308-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevc_ps: Check depth to be within 8 to 16 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: 9EDaXe/9DhYu Fixes: assertion failure in bitreader Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-627318668066816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 2f505ba2f7a..d8664ebda7b 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1545,6 +1545,10 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, pps->luma_bit_depth_entry_minus8 = get_ue_golomb(gb); if (!pps->monochrome_palette_flag) pps->chroma_bit_depth_entry_minus8 = get_ue_golomb(gb); + + if (pps->chroma_bit_depth_entry_minus8 > 8 || pps->chroma_bit_depth_entry_minus8 > 8) + return AVERROR_INVALIDDATA; + num_comps = pps->monochrome_palette_flag ? 1 : 3; for (int comp = 0; comp < num_comps; comp++) for (int i = 0; i < pps->pps_num_palette_predictor_initializers; i++)