From patchwork Mon Apr 22 01:31:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1999673pzb; Sun, 21 Apr 2024 18:32:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUATVSHPRnHz8vQM96Zhz4G4sRibiCdWs4Dgd+U0KVmTmMhNuWobKZ4KSAtawmLp6d20E/qBMjRs4mz4wm7jqt/WiZ4Kmmy7d/9vA== X-Google-Smtp-Source: AGHT+IE0WvgzglfXBd6SqYCR+Rs8cieZpAKl0p1r460ASCS491RKbwiIkuGt712s0zlK9Lzg7Htp X-Received: by 2002:a50:8e1a:0:b0:572:61:8560 with SMTP id 26-20020a508e1a000000b0057200618560mr2208277edw.20.1713749521426; Sun, 21 Apr 2024 18:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713749521; cv=none; d=google.com; s=arc-20160816; b=1C+xgdt+dQPG/RK2zW9sGAg3rBWxXbtapJVtQ+lr1VSZt4Mviq5Iiw7eJsY8B4j8Al W5dQIcaKYNrdrYcZcvDAz6wuvlZTbf12V6E6M0TYzUtwua5ssZBKp3TMugYq+YKwCHeD GM7pdw33KbjO6daO8bJcRa15Xk3ld8PFssx69LTHRngSkLbvwOmfO5YgfRhS2sVAbIaK vXXw7uuc91xAZ5SFC2kxwTAGr35F405EQR1DB9jbb5b3qIgTJgSfB1OUEB4Eie1FI4lF VTgukJZFhxNGYzQmsaMnXeZRC0/UvEzPTjMP8VZUN6t54En694Bln0K0+7cLDnxmTUo/ pHeA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=KVoPwEvI7FFsGf5gNghdKDLu5E5yIljwLbg0cYj6XZk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SQfA4aBpwbtevp2PY5Wfowf8UVvOaWpWbMSCiz/mgr+pJg/xD/1QMxZZ9GtAjmB0zp yhsxxmsOWwU+PFO6Nc4IR8ZqKYR5IPFhMAVET4ERGrtOwd3OWKWQ98vPS19gtfy0D0nO rbZZtgD/1kvX62adlqB7B5CFQ3VGCa4HtrWFqRno8Dq0Z/mBEk1a+axeUH/ABn8VloUA GxyL1HbGQ1cpPzkFIH/xlQZhOh4CYiO4NCfiE7SpFreyLkUYbNhXOCdjIp/2uBa2BDNp pMyXwsp2ln2K1fgGPIPLQ63Xk6Z1O/3vnev9nKoilmbHqTIr5zxNdQv/bJ8c06mDAfeV kbgA==; 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=l2pkFrZ7; 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 u2-20020a50c042000000b0056e5136f964si5303704edd.360.2024.04.21.18.32.00; Sun, 21 Apr 2024 18:32:01 -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=l2pkFrZ7; 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 C1D2168D29E; Mon, 22 Apr 2024 04:31:57 +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 4194C68D1A6 for ; Mon, 22 Apr 2024 04:31:51 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9DF6C1C0002 for ; Mon, 22 Apr 2024 01:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1713749510; 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; bh=IG6yZrJyWRXJ0l3xHoFxoLCIHHGxZAia1XLihZJuCSs=; b=l2pkFrZ7HYAGlJ6P6xznzTjLC40WkpVBV8QY+MLTaQRSBsTKSvti5AK32JxVYxJqk4eEjL yNAF8shEXRMUBLMwkZkFzhmfIIaAsXfL+OWUFehvQpY64OAqDLGep3OcfF/Q4HnSkRJUf+ l4WpgJU/tzoNEqrKOF4puk7t3LpWlY8NBCetmTDnxtTheddre39ZoCN5gagxVYKICyH8F2 ceSMLwW10Q6bovGfsOejGY20b+41xJHwW9MmtRKn59NGQwGx6cFMgUT8YK+LhMw3AApfxu tcDgtnyqcwZnQZCYNqGONXvyTflOUi+D/tCXixWAwcnnj+Hovnx68xqHGyRg9w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 22 Apr 2024 03:31:50 +0200 Message-Id: <20240422013150.458103-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h2645: Check NAL space 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: QhnG+qSopEHh Found-by-reviewing: CID1419833 Untrusted loop bound Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h2645.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index fe2e383ff33..1a45d424bae 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -709,7 +709,11 @@ static int cbs_h2645_split_fragment(CodedBitstreamContext *ctx, start = bytestream2_tell(&gbc); for(i = 0; i < num_nalus; i++) { + if (bytestream2_get_bytes_left(&gbc) < 2) + return AVERROR_INVALIDDATA; size = bytestream2_get_be16(&gbc); + if (bytestream2_get_bytes_left(&gbc) < size) + return AVERROR_INVALIDDATA; bytestream2_skip(&gbc, size); } end = bytestream2_tell(&gbc);