From nobody Tue Apr 7 15:52:41 2026 X-Original-To: dev-commits-src-branches@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 4fqrLd3wgpz6YTbT for ; Tue, 07 Apr 2026 15:52:41 +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 4fqrLd2Dkhz3t2T for ; Tue, 07 Apr 2026 15:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577161; 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=HOCvSeyrSb0g2rE4YE+o81G8NrB5fakT38gEBFWvcYY=; b=oZfffAFbDOWRCZLXSatzGj+ZIx8iZfQ3l0AE2IwKPGpM422u0DYiE5NFZHVh5WVenZDvK3 lQBXkAepOJUJosJojw7iz5gbbM6JQLxgQd+s61CTqnnZXBBTTL6DKEO35JVNN+tSycRJvD WT2CWwuazqjxsGOdEICJiiBv/dGzTX7SY9U8PHvX+U2U+SzAdbDxPPzoT6La9XFnbTokEH 8OAe/EZD3GdsWRMLW/U3Y2fdqia6Zg1HcTVQzYHfIqsRW4gaePtmmqHAFvVoO/u6DbaHdM rrlnKKwBRV3wtMCALXFjGT839ICVATBjLcLRPQsdKBYNTxjvIOhXgnj2/KmpXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577161; a=rsa-sha256; cv=none; b=aEUJe/evLEp52lsHOi9vhodGhWVB8ZI94W6RHd+aBs8Wu2OSljnV70O1H0kX39tvI1iMa3 Ot8N6F/o01DZm3GKMkkTeujxWw17YTFdJl27CPSLtEbZrCIfbrkjgJ/92c/vByMtV1t+eG /eKFM7o7XR0e0pYpcsVpPbqBoJKqrkwziMsP6nhK3ln4bPQtoMwnX+LiEaZRI92HGoKLzw r1WVd9e5tJa8ffOkYIFdqrHYXEHgP+ojhaWoBRWgKNwRa9eB/UlUiZ5sBVVSf32MyEdxBV qbI0BWkKEZr0323xIa3z16nKVExgtkPdJXbTSmYKPcK11v8Y2Odu3f4kW6EhBg== 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=1775577161; 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=HOCvSeyrSb0g2rE4YE+o81G8NrB5fakT38gEBFWvcYY=; b=JxAxF03jE1QKRpO1E8vPvqqNUDRSyz8vCmM4uAboazao0POSmjzhAC5M3Q20x1XYHT07AU anj5GbbkxFLe/IH2QibdrI153FXE/spBCr3QWqkVN1AuGrUX6HK34yu8DpnG3m2+hpW8YJ 3wy/GCOMx5o0KHgi8fyUpClUzGzTFkBQOpju8dwdt+gca/LsnKdcVKsC799/hMxCR3JJc3 ++0o3xtXtlzxanOuW86j3JWdJpdlWFzswaRTSNrT6rui7QIoYZVwDrtsyi2sWpoNmNiIK2 Aph79ov0Y8yOftAkOnj4JHsBq/t1rQCdg+A1dD1bpH0oFkmucb0onW4/aqs2Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLd1HXkzmDs for ; Tue, 07 Apr 2026 15:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45621 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:41 +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: 7c717c3ba09f - stable/15 - cd9660: Add length checks to Rock Ridge parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 7c717c3ba09fdb83a8f78541989b91665c05b4e5 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:41 +0000 Message-Id: <69d52849.45621.6827b795@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7c717c3ba09fdb83a8f78541989b91665c05b4e5 commit 7c717c3ba09fdb83a8f78541989b91665c05b4e5 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:08 +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 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: