From patchwork Sun Jun 23 23:01:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1693108vqz; Sun, 23 Jun 2024 16:02:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1RhdT5H2ONKWk0csFWFHfkEzSb942C16bHi9o0wiEAZ8bNW8Buwz2SJBfY76i2uEKOPtCnD8wi0iOsKeeiuT7gMNthkpNAlESyQ== X-Google-Smtp-Source: AGHT+IHc/vyBBgXkeLI84WiGkr7zftiLSY4FJdTkldpTsd6B6ZdShYkKoSyn3zdl62pSEi1LlVFQ X-Received: by 2002:ac2:491d:0:b0:52c:e1c7:fcd7 with SMTP id 2adb3069b0e04-52ce1c7fd80mr1529636e87.32.1719183738107; Sun, 23 Jun 2024 16:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719183738; cv=none; d=google.com; s=arc-20160816; b=jyVTziaQNU0bLMf6rpX18izK+NDD3+g7T1+F/LztZ1vvfx6szTg3qgGH5pruJtaY8i bLmTDav2bZH+3uQDOfds04oPx2XwfqGR42c4vajk+XD7m7XW6NyB03QKAZee9tFH3n9T 6BHTTOGLrgi+RXmgGKYuUCDiKMgdY5RE0aqhi8wzkm/HXDhC4gvurbVJCpDIfOuwueOw +MiqwSqBokgNkKEPCjZaohTasZEDszwPJp54vs6xy8WdH0FOvDR7kIR4kO41IGEbKsR7 7DKtwLFSJqenylLuq3f9pJ3ym249Qt2GsbgWJBxMjkY/gQH70v7YH4vb9PdV39qWulUt 3oXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LIENG74ecncHgWVJr73xNtBILX/RBaQFhp/RHEAK3MU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KNQPK7o7gmb8tw2EoQtLxB3JYgF5hlZSdiJUd3CUU3ZiLajW7udD6pOh8ogBj0uHHJ Oiitv5XXusDivPwBGMlCoETLTtBY6wouxxSDFPuxEY8qX4YLq7dH0tVSv7IYVl+xKKQI MjaQJd5i5rJK32sWAej2SgosjKeTX65ZB2/Dfg24I3jyRsjL2mg0o7wb6Fdfs0x1+mVh GAUZ8J8N3sK7tvLgnMtCjHHXpkVBS1km49QcDRgM73StcpWpysBkdsATEMBWuAES6APR F/9pjDuQB8HsUCTjNDKvsPo/zYSp+PWKxC18+HEeoeIs02Am5woUlkAM3KmvsBPyQXPu MKUQ==; 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=ja5zG+I2; 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 2adb3069b0e04-52cd6440f4fsi1789724e87.488.2024.06.23.16.02.17; Sun, 23 Jun 2024 16:02: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=ja5zG+I2; 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 5F6D068D650; Mon, 24 Jun 2024 02:01:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9448668D61B for ; Mon, 24 Jun 2024 02:01:42 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E5B5E1C0004 for ; Sun, 23 Jun 2024 23:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6kqBzpev1I4VBNHf4Ct7/juZv8n9zHGCYhNomJpBl+U=; b=ja5zG+I2BIKbJCMBD6n+712LmE+BJefkAIXo/qHunJuP6UheBDUbhJfmJy2xG9qVNGC8sB HGObiKcFjtrtknNGZbaL/R5xOTzNcWXPjKUaQC/kfgSIeNIDJlFVyFnWWVAxzXYQLBWwIf a4Tk9NwvbDHcxivrt9tidBnLaY8X4TN4DNc+NyaeUGErzCR/DxEEb5u1nKcIWN0rs2eR3/ cygGTGjmTsoh1O1sLzm2rVQlXkdqosx8KwFU9w004JKVGGoIZrCff6l41ZT4Jc5gI4K20d O/WgdytpDS4rb4LZxfybgCyBrwx0B+k8YLfO8I0jfo+gKb/blu+gDQvl42+GFg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:36 +0200 Message-ID: <20240623230137.1749178-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hevc/hevcdec: Do not allow slices to depend on failed slices 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1JJ2H2dZd51g An alternative would be to leave the context unchanged on failure of hls_slice_header() Fixes: out of array access Fixes: NULL pointer dereference Fixes: 69584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5931086299856896 Fixes: 69724/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5104066422702080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 5 +++++ libavcodec/hevc/hevcdec.h | 1 + 2 files changed, 6 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 4dd84d4953c..0e0a910641f 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -626,6 +626,10 @@ static int hls_slice_header(SliceHeader *sh, const HEVCContext *s, GetBitContext if (pps->dependent_slice_segments_enabled_flag) sh->dependent_slice_segment_flag = get_bits1(gb); + if (sh->dependent_slice_segment_flag && sh->slice_failure) { + av_log(s->avctx, AV_LOG_ERROR, "dependent slice failed\n"); + return AVERROR_INVALIDDATA; + } slice_address_length = av_ceil_log2(sps->ctb_width * sps->ctb_height); @@ -3157,6 +3161,7 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) int ret; ret = hls_slice_header(&s->sh, s, gb); + s->sh.slice_failure = ret; if (ret < 0) return ret; diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h index da4d83e6615..91f20ea26ab 100644 --- a/libavcodec/hevc/hevcdec.h +++ b/libavcodec/hevc/hevcdec.h @@ -213,6 +213,7 @@ typedef struct SliceHeader { uint8_t first_slice_in_pic_flag; uint8_t dependent_slice_segment_flag; + uint8_t slice_failure; uint8_t pic_output_flag; uint8_t colour_plane_id;