From patchwork Sun Apr 9 14:26:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1598570pzb; Sun, 9 Apr 2023 07:26:49 -0700 (PDT) X-Google-Smtp-Source: AKy350ZE1QpMoyPZ7Be78lUJo4J1bh+1LxUGkdpqBAegCISp7NBM1g4Ia6ZF2K/m+U6loRtZ7yQd X-Received: by 2002:a50:ee98:0:b0:502:32ae:14fb with SMTP id f24-20020a50ee98000000b0050232ae14fbmr3906644edr.5.1681050409114; Sun, 09 Apr 2023 07:26:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681050409; cv=none; d=google.com; s=arc-20160816; b=rGT3/IJ3GfWpaKlbgIn2CK3esmSxZYNvFAEi1DdQJ818zIPm/+xqzhsyyc8Fxi17XE FtdP9+tKsXoqauV5kiBqldZNbxVIL7pr7v3DNZoGwwee8qipMYRKPVqNqL22SfXKys0l gWqn0MQ69IHhvTjjc/TN/pr56BeRkWCS6H4HkH/crCFaepHzQbx2lYRXRKh1oyakTm/Q unp9+r78dq1DRpynh1moPDgiJ0ikD14nTYPyvh7zaszRo72ZlBdHsn1Lcdx36i+oZBwQ fs1Vub9V//C2xIKdvzAnBFqqRE3WARt1ad3WV03Y0jZVzyWL6QykkwoD90jJaN/bnUkO ooSA== 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=DldSpguFl8VUheoeSqr/wBhjbn8Vf82EFPzxH4pmPFo=; b=jf6l6+fAPOEk55pA3ZwvBFICxvLokUHOqCCRrclYKFzt/nX29gFYb3U2/KB3mUucOZ 8cCe4aiWfUaFuct/stcck/ZXobNosDD1/dG/x+5e+4b6ckASp0NbPXf6czsSvGxi88Lk 07YHVKeAWa/bIdlpQ5Fmu1FCcjcJ+8q1yu7uOaEICyYgLwVgXgZrOP3QbJd34dSlcffp +3z9LCASH8qBZUdeTeqNaBoqTjOKmOo/+tpRWJ9Y92KkEVAwnuX1qOyqD9Qg5ExO/hy3 62zUf7sMx/2DsfGZfV+3Tgdqf8BRvKutS46mXOxz38Cak9WewgIzEp59KhuhK+p4xWaj ijBQ== 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 p14-20020a1709060e8e00b00949aadb2d86si6704694ejf.645.2023.04.09.07.26.48; Sun, 09 Apr 2023 07:26:49 -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 9C8F268BCF5; Sun, 9 Apr 2023 17:26:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F63568087A for ; Sun, 9 Apr 2023 17:26:30 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 86A2620007 for ; Sun, 9 Apr 2023 14:26:29 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Apr 2023 16:26:23 +0200 Message-Id: <20230409142627.19820-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230409142627.19820-1-michael@niedermayer.cc> References: <20230409142627.19820-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/hevc_ps: Check num_ref_loc_offsets 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: d9vl8wmmom7C Fixes: Writing arbitrarily over the array end Fixes: 57812/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-4536557859373056 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 348e4d8de2d..be1d668c263 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1392,6 +1392,10 @@ static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, pps->pps_scaling_list_ref_layer_id = get_bits(gb, 6); pps->num_ref_loc_offsets = get_ue_golomb_long(gb); + if (pps->num_ref_loc_offsets > FF_ARRAY_ELEMS(pps->ref_loc_offset_layer_id)) { + pps->num_ref_loc_offsets = 0; + return AVERROR_INVALIDDATA; + } for (int i = 0; i < pps->num_ref_loc_offsets; i++) { pps->ref_loc_offset_layer_id[i] = get_bits(gb, 6); pps->scaled_ref_layer_offset_present_flag[i] = get_bits1(gb);