From patchwork Fri Aug 16 23:15:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp732819vqj; Fri, 16 Aug 2024 16:15:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4fKEq8kNo1hHpsbG/iEu2LbxPeZQ+3OjYq1eQaRFZQfUCScn3uknNUyRrFzDHcGDrkv12YCpDZrJp1prPa479Rdwh3D9wPI84Ug== X-Google-Smtp-Source: AGHT+IGmaKw3aKnrW9I5vWYYlzU0q7YJo4YVlJohjdxfzyRUHCpNSSGi2VC2+0y4lmImYpCs8rEi X-Received: by 2002:a05:6512:1152:b0:52f:42a:a2db with SMTP id 2adb3069b0e04-5332df488e6mr458660e87.28.1723850131610; Fri, 16 Aug 2024 16:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723850131; cv=none; d=google.com; s=arc-20160816; b=fXb8eXFJ26+DNlB2JCYdjV04STzt9DshkEIqi/9+8QF6/ekBjDn1zb1gazR70WuSq4 G3kTeHaWJ+6mHUzDsSh7lnwIm1Q7pgZyjL2wunAZMblFHpp75BS7dnhQYDKhnr1iqa11 ipbgXQv41WASIMRlXlWxjX67oCQlAGBBNv27J/u+WTRMhGwuN7qzS96Ftiik6zio7ZHM q/tt33gKJK4SxkONk8DBLnuazAmXV80MmLCew+jpHZKIHdf9+Vw5XT/Og0R9VPct7iPI vbtGbcHJgxsOKN9Zxw+pkFf8E8Ya8Ck2TF5M4MLbyiDKQB0e3achbDVpmZxQC815zBlN 8lFw== 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=T2Rw7F4RPJ9LZptZonbOZVo+8uTZXmDDR1Cu1CJ3YO4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=oZ/KKFFCUB+FU+hoymN9HocMTsFk8A4xKuIDt31ycBA6mPZq5BH2elCL2ShM46nUDv C5ywakef3LX9OUBPF9JZcV+q+8Kd4nMTiJd4A4Ws/qwxFj3ytPaWQkew69oLF9KjB9Ku xmzRW7aAX3IpKraAwSzgVBVBog7vhOywlQnT2JZcWBgcoYIBEjhI5W2+VSa98rbLTM6K IwhG3bOHFSYjEKjRTpYsORQPHsYA8XCa7v4ZVkPT4gkuDszSZUAU5MUWE514XQb6R8DJ 0gPcvFZ+D/yjS/XsFOZb0j/g8Iy9Djf9ZYxXFGzQ/2ngjMDaeud2FfyhY8Pb1aEVfjvV tQAA==; 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=hCorO6ya; 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 a640c23a62f3a-a838397142csi253878266b.773.2024.08.16.16.15.30; Fri, 16 Aug 2024 16:15:31 -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=hCorO6ya; 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 8E39868DCC3; Sat, 17 Aug 2024 02:15:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB6C868DCBF for ; Sat, 17 Aug 2024 02:15:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0B9C4240006 for ; Fri, 16 Aug 2024 23:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723850106; 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=YRUeSR2xdu5hhmjsMVMI5dXKZsd8+pjtINXRDx28olI=; b=hCorO6yaGLdGXIlWOBic3+Bkpz97dPu1/4kSO+HTZWMXXck+m00DNCu/YxAy08RMYDdpAw wkgF9mYn3j/diA9qYLTtt6V8Xcw/CY+Ts4U2PUi8kQr1IXPxXxYiuH/EqBusmAP+kBqqnV XXOtqY9EXsaBsGgWrxIPrQlLLdfUFrgr8/xTnvivzBqLb8sTlnho3roKOxtd4q4EGT3GOd QEtbUqNi/1TEBvNM/I3BZZUhPpBMVGQLfwn6rJ36ujsSDIktjv0JT8E2WHI78yC4WP7bkB KEedL5rCnpcwrZzepWbs4hhQ1pdzhyj9wfPQD7lyt91LLZU3T5SsWxxGixLaQw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Aug 2024 01:15:02 +0200 Message-ID: <20240816231504.3166080-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816231504.3166080-1-michael@niedermayer.cc> References: <20240816231504.3166080-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/cbs_h265_syntax_template: 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: KXUscOjLmxM4 Fixes: Assertion width > 0 && width <= 32 failed Fixes: 71012/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-6073354744823808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h265_syntax_template.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 12fa185c774..d23cb58e863 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -2307,6 +2307,10 @@ SEI_FUNC(sei_3d_reference_displays_info, (CodedBitstreamContext *ctx, RWContext else length = FFMAX(0, (int)current->exponent_ref_display_width[i] + (int)current->prec_ref_display_width - 31); + + if (length > 32) + return AVERROR_PATCHWELCOME; + if (length) ubs(length, mantissa_ref_display_width[i], 1, i); else @@ -2318,6 +2322,10 @@ SEI_FUNC(sei_3d_reference_displays_info, (CodedBitstreamContext *ctx, RWContext else length = FFMAX(0, (int)current->exponent_ref_viewing_distance[i] + (int)current->prec_ref_viewing_dist - 31); + + if (length > 32) + return AVERROR_PATCHWELCOME; + if (length) ubs(length, mantissa_ref_viewing_distance[i], 1, i); else