From nobody Wed Apr 1 17:14:57 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 4fmBSK5P8bz6Y9Wc for ; Wed, 01 Apr 2026 17:14:57 +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 4fmBSK2rM0z46Nf for ; Wed, 01 Apr 2026 17:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775063697; 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=Ll6H3EcQxBmSqYIAJgN1Ty/1Vbsor0BhjNJFa5ivm8k=; b=p21seTQvROqTaui46RZ8Odsei0eNI+JHn93OJ1TbtH35PSPw0npM1zEU08USMm5WcmuF9u dvdEmiyku1lCQ8ODuqxpl6Zl+stW+oF/ECh9IKBwyheK0FEU60+aZFBbNAKKN5WUSZf/1T V0W/hCjkcYU41i7vH75jER5+dlByMcfJksbcoVre+tNFH1UwDxzCsVcmmyt7pM5B6ibeKL 14qVJEfjKJL83COyIGEHzm0GvvE0eLxcc6zXTbVuFEnmS31E4pr/b0E1sqiLKvVh/ovvBc ohAKWLXmRYXmlB6VvXXMhbUJ6du/mCwYU7U94BgZbD3U8kYTun6w+gLw76C/Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775063697; a=rsa-sha256; cv=none; b=Q8Nl2OYNGa5+q9BPS6lnZDlcoDJmjtTFOfI27PESjApgl3Y6qYXFaa+LtIVS071l08bCo3 ONli8w2RSlmnjohZ7TxRUTUmPq5WUphqWUuv4wApgb+qDrALuv9XTbknnon4cEYk7pI/ZP nPI2TMrcSa8roiNYHqHs6WmiW4Kts61fopaCIRh5iVOqUAVJ2wLAzW+kr6f536QJijmhFX tJyrB1H7QAGTACd0FsKZm2RjN3d/VHaMFgqHmdAhNdxP6H8HtusrV5h8V00G6b1LNZ2U9E HDytR6oDxf7jPQ5J2HXyom168KJH4MwvlFUA5Vxl4FE7K53FvRnltJCx6jV6gw== 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=1775063697; 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=Ll6H3EcQxBmSqYIAJgN1Ty/1Vbsor0BhjNJFa5ivm8k=; b=knQom+NBjpTL7U/rnRfQzJ6OWmhQPOxMvYV9AoeE7BChcWLsLJ4WDMOXGY4KZwOgluZO+w 1bc1Z+Tqj4l/UgnBTgKx0kaf0xeh+yJJb2Tbd/HSySkA8ohQ7y7oel0+C98ILxVEg9RnV4 Swyg9Up1jQzjbpZU683HZMnHMjwas4RanQ/dINl8prTbSz8sg1aoVjKE66k1CiJryx8WN6 xZ6uU2GO4CIYD9CtT5sRMMqGgZomWBaN2tvMxGA2AvZUE+FkprEssMlqM77+cN/a9+vK8C DiLNk9QdRVHELIPB42A2CdbIGcoGvEqQ23RvfmOUSTGDc7dlZ7MzE2oN+SR6kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmBSK2GZhz9BY for ; Wed, 01 Apr 2026 17:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c22a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 17:14:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d0afead87607 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d0afead876076f605c363f03d92304d1bd75be1c Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 17:14:57 +0000 Message-Id: <69cd5291.1c22a.1a680901@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d0afead876076f605c363f03d92304d1bd75be1c commit d0afead876076f605c363f03d92304d1bd75be1c Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-01 17:14:48 +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 --- 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 6e91f1abb9d2..9bc8ef655368 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -175,6 +175,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?"); @@ -246,6 +248,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: