From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id AE2CB4C1C5 for ; Thu, 9 Oct 2025 02:08:32 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'9Q7fz42TkuWLZJvTCsyKTl319mLEICZXu3gmn3XooaQ=', expected b'i9Ld2T5zMeuXn3C7pjhrKD+HnR1IS47/X8RJ+/zIeVw=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759975698; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=9Q7fz42TkuWLZJvTCsyKTl319mLEICZXu3gmn3XooaQ=; b=5LSGj7TkZUFtldyLGiHdNWZgqgaVFxVBfk3/CAzcdxKa0bFLMKEDb7f6o00z+M4MFWDLP VseiylG8jhk140CthY0HSzgpOvAYfOaH5qGhT0GtMlGPKa9OqFsTuqqfiMBTn21NrvO4Ptq ZaiEmWuWc3Y5LztTreCyZBJ1dESpw6o03/5wqxAWa9pP749r39DAMA+8B85aibvZYo4p1ti yuYwYk7yOS3H9JfwsKDcpBT16HGY1PMxpTGzcsxMLst/mIF/nVQZh2iBUSG/SlwZm+TFQm9 Dw9ls2N2mhsoxG5eroK2ALad3NhdNKAybkgML9HE4ylfODL8v6yAoB8xop0w== Received: from [172.18.0.2] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 77FD768F26C; Thu, 9 Oct 2025 05:08:18 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1759975679; b=IuPE8vt4vID4wmYFm4NO1r7fPGb2Ksh1ORMmjy5wwRx4f71GpO+s/nA4iE7sYNpN0lx1E gj00iAQ6wzptwcgrRhObbZXQclgF9IgNJ4485QK4hHBijLFeSLvJDCFfSMrlif05DSXRHZy 4N733BYWUBVg+aRFLLaMpuekeZgpCi/JbxUfdu1ZYYEtBhgJ8IE83ASwc8WfQSPwpMcx1I+ LyBh7yu+b8RCf4fAgeh6LlCWmOeS+pZwGanAEhIJRzdhGc7l7wMn5pSb2WWTL30wghIQqKA fypExR7ZXgVClJN0n1ZQmOIzssyTh0Koana4abvSCuhZ8NzLY4p+zfcMU85w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1759975679; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=1DTj1LdhudbD/S3cPSmRvZW2YUJyliVxJw667sEwrMs=; b=jRJGAvt0r5TxMDuiI5Qcr79Ze919f5zaP+1UrhO+q+SNAJeh/NtYyjXS2xDbHtzdtddVR lHguoEh4VjCDyTEK9BGiMzMpaqnN70g6UxFkk8AiA8qz4fGSQh7Q3lCklMboWoHgaI6M+M4 xB0/z4ZITZ5Nh3tt7ARSM8aC/myrPCo55J7jr/DEiEJ9aFYCTtubgKfOS+C2dJMewrA186J 3cG++M0zs42J+VwPiMgthpVcelL+ucQEeZ6t9aA34jt9yZk/adYdXhaD9BfG/FiUut876Kg g9qG1QApAVieQfH6JK7YgdK2CtgcSXGs0JKZZXIeqc9uQUw39yfpNNMyojPQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759975672; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=i9Ld2T5zMeuXn3C7pjhrKD+HnR1IS47/X8RJ+/zIeVw=; b=3qBUirFVvhZO3qGee7O1YMqPqvd7WzjsEtkKwaMx+WEbP+h402ftcHos3JHqujc/U9vHQ AiLGiSIc+gvfKGs84+AOgBfHLvomBqASq8/4gJs6tqXnjrrIx4qmdx9D1PFdFXEfOUTsnWP KhUOJ9hQVxfYk+UpRdTMlurDVNSn0rce+d3R+HqPVQl4PWFAXbGp/rxVs1iGkAx/y0T0n8l cOdNz13yzMfuPJ4dFlCm1sjv6t8AqTGSYTV7ezD64iM4vsTToCfDAMfF8V76GC901V1iRmQ nKEoFZNn9tdr6/37lpzpmNMbJToutynjdvl+BBMROHtJhGYlmsZrKhrztcIg== Received: from be50bb5a3685 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7702D68F172 for ; Thu, 9 Oct 2025 05:07:52 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 09 Oct 2025 02:07:52 -0000 Message-ID: <175997567258.65.8366013149215651693@bf249f23a2c8> Message-ID-Hash: D2O2EWXRINMZHLS23OIAZ4WBU577GK7N X-Message-ID-Hash: D2O2EWXRINMZHLS23OIAZ4WBU577GK7N X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/hevc/sei: Do not leave invalid values in HEVCSEITDRDI (PR #20675) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20675 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20675 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20675.patch Fixes: 439711052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-4956250308935680 Fixes: out of array access Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer >>From 4e1ade1212daf4b71a5e28a791eeea5b1c13f7e7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 9 Oct 2025 03:25:01 +0200 Subject: [PATCH] avcodec/hevc/sei: Do not leave invalid values in HEVCSEITDRDI Fixes: 439711052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-4956250308935680 Fixes: out of array access Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/sei.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevc/sei.c b/libavcodec/hevc/sei.c index b8e98cde89..525f524492 100644 --- a/libavcodec/hevc/sei.c +++ b/libavcodec/hevc/sei.c @@ -167,18 +167,21 @@ static int decode_nal_sei_timecode(HEVCSEITimeCode *s, GetBitContext *gb) static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitContext *gb) { + HEVCSEITDRDI bak = *s; + s->prec_ref_display_width = get_ue_golomb(gb); if (s->prec_ref_display_width > 31) - return AVERROR_INVALIDDATA; + goto fail; s->ref_viewing_distance_flag = get_bits1(gb); if (s->ref_viewing_distance_flag) { s->prec_ref_viewing_dist = get_ue_golomb(gb); if (s->prec_ref_viewing_dist > 31) - return AVERROR_INVALIDDATA; + goto fail; } s->num_ref_displays = get_ue_golomb(gb); + if (s->num_ref_displays > 31) - return AVERROR_INVALIDDATA; + goto fail; s->num_ref_displays += 1; for (int i = 0; i < s->num_ref_displays; i++) { @@ -187,7 +190,7 @@ static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitCont s->right_view_id[i] = get_ue_golomb(gb); s->exponent_ref_display_width[i] = get_bits(gb, 6); if (s->exponent_ref_display_width[i] > 62) - return AVERROR_INVALIDDATA; + goto fail; else if (!s->exponent_ref_display_width[i]) length = FFMAX(0, (int)s->prec_ref_display_width - 30); else @@ -197,7 +200,7 @@ static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitCont if (s->ref_viewing_distance_flag) { s->exponent_ref_viewing_distance[i] = get_bits(gb, 6); if (s->exponent_ref_viewing_distance[i] > 62) - return AVERROR_INVALIDDATA; + goto fail; else if (!s->exponent_ref_viewing_distance[i]) length = FFMAX(0, (int)s->prec_ref_viewing_dist - 30); else @@ -209,13 +212,18 @@ static int decode_nal_sei_3d_reference_displays_info(HEVCSEITDRDI *s, GetBitCont if (s->additional_shift_present_flag[i]) { s->num_sample_shift[i] = get_bits(gb, 10); if (s->num_sample_shift[i] > 1023) - return AVERROR_INVALIDDATA; + goto fail; s->num_sample_shift[i] -= 512; } } s->three_dimensional_reference_displays_extension_flag = get_bits1(gb); return 0; +fail: + + *s = bak; + + return AVERROR_INVALIDDATA; } static int decode_nal_sei_prefix(GetBitContext *gb, GetByteContext *gbyte, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org