From nobody Tue Apr 7 15:52:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLq2tD9z6YTKF for ; Tue, 07 Apr 2026 15:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqrLq0s7pz3tGn for ; Tue, 07 Apr 2026 15:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57QKtWD9cGxR6hEuaTnmVM3sBs2AAW+UOmq7AaiKdqs=; b=B4k3h6hawFXS0+q5XcYjPTN0ntTs3RwT6PiS1pEBfd7qeeaPWKynVZrOvKXEip6abgyNKX SbMQqKMC4OaLmYOdxt+I04pUKMnrXATdrcw4jUsiH8/zV7TeB87UNhwEkZli5akVcUQvHP ph49YrSnqKpDai6GsMZ4FwHCBDeBgSynEDnDRz0/UDgV3UeV9EB98vFfXzUsygRc8kVpRE 48uWiG4LW2Z8eFhONa8UnUj+9IVYBh4WN+YQ8y/xR6p1ecqpHwWP9aFOrRnr7zwxrjQe08 TR/6RhCisV2wss5S3ojONF7QzkjX4y+J7q0bLWfBpit11cJ7cHaVBDCahW8TTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577171; a=rsa-sha256; cv=none; b=qSbCHoVReRT5QHfiS4YwiiygxGx2nrEXUjPmvigtuwwTm5Y3ZQ7NrCi3pw25XZeQF6P5zI 0pG8HT6fgLLIHfquFm84Uy5VJJqa02bbEHUJ/uRsQPgI3/MDyEq9m8XcvEqvCT+wGyMK18 DEb0lVBIxcYUD7R86xiWVVVZFwVcTeb+P+oKQop5j1ynKe14g334Ovrw/FTjnW+2h2/A+4 g9oiK0nlx3Wsarff6oL8UZtSsGd0a89Cs2aNtXvBbwq4l9c6/ZDONUZxw1eM9ZQDVBL+Ji YBhYhg+IVu3+z80d/Vak4ZzmGMhNjF4oyRo+QgY8xcjiZYEHHpyjSX7UKjWxmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57QKtWD9cGxR6hEuaTnmVM3sBs2AAW+UOmq7AaiKdqs=; b=MTfoYF8NUsJB8YWhAXxS015rd4aK4NNrh79iZDwkO9oPaAceX3WmFheGZn2vUKK0pgdxsl pekq1kDW+j+4wvWex3T6Pwox1nw0xQRHuNX2w3zwpnmMuD2It0M/FHIWRTliT3Zzg8RQbu RlX46hcBanZzH5KrW0xzFy44QaozD0/qPm9mESlTSAmqvwsNnGWLeN00Fkm8Vnm1joMoQL oCUIpO5uDQrjpy0jxtyGkA/Iag1FGx1WZk0nBzYQL6ILmB98jdPRBbNYHqZOj9IdunT/wv s/BwngjGO4VuaT6/03ocLPYWPj3bGG712JYgHaShqV7gj0o0q5+w6W3ngxIyFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLp6y3bzmW9 for ; Tue, 07 Apr 2026 15:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 456a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 818243722f6e - stable/14 - cd9660: Add length checks to Rock Ridge parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 818243722f6ef4e08bff05a7d3f38984fb758506 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:50 +0000 Message-Id: <69d52852.456a2.6ea479a6@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=818243722f6ef4e08bff05a7d3f38984fb758506 commit 818243722f6ef4e08bff05a7d3f38984fb758506 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:41 +0000 cd9660: Add length checks to Rock Ridge parser * cd9660_rrip_slink() did not check that the lengths of individual entries do not exceed the length of the overall record. * cd9660_rrip_altname() did not check that the length of the record was at least 5 before subtracting 5 from it. Note that in both cases, a better solution would be to check the length of the data before calling the handler, or immediately upon entry of the handler, but this would require significant refactoring. MFC after: 1 week Reported by: Calif.io in collaboration with Claude and Anthropic Research Reported by: Adam Crosser, Praetorian Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56215 (cherry picked from commit d0afead876076f605c363f03d92304d1bd75be1c) --- sys/fs/cd9660/cd9660_rrip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index d3b8ccab16ae..28bf7fd3a097 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -178,6 +178,8 @@ cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(pcomp->clen); inbuf = pcomp->name; + if (inbuf + wlen > (char *)pcompe) + wlen = ana->maxlen + 1; break; default: printf("RRIP with incorrect flags?"); @@ -249,6 +251,8 @@ cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) /* Inserting component */ wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; + if (wlen < 0) + wlen = ana->maxlen + 1; break; default: