From nobody Tue Apr 7 15:53:01 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 4fqrM234PSz6YTbl for ; Tue, 07 Apr 2026 15:53:02 +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 4fqrM174TGz3tQq for ; Tue, 07 Apr 2026 15:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577182; 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=SDGu9IPP8jSs+3SmBnZB7gRb2BeL+JC4uI3l/l4IvCw=; b=SgxyGA9ODMfO3r0zYwSixw5F2sVT6zkliqD3BkByGNf/lZwkA+6xnzKZrwlUPqogLZ1O+l xNFSlbQJIU9czz23jZw5dVhxgQ8VES19Jo3wWD21Jb18txdssUVMGv2hfxa5LRT82jG/88 NW4He6jWqdtXFYLi9h3ONO1dcX2FcHoAQhOIZCvE34ja8g2Katxdsg1vOvf6OugpVXw4iH C6XWeTHTm0NQkfGzu1WVuHU5e6gIzwFixh56UgchOCKs1WB4hQqUYm1JqA+wu9PAC8DOm7 +aG7zIPO0ozKI4nZOt9Io9oRPxbRuDSHVx7XU/xFbes2oqKIOb6SmcLRNU7mhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577182; a=rsa-sha256; cv=none; b=Nj0mSz30cYdRVBliI8+jzVXt8D8rmmTZ+B/PWf2LZ3icePs7riWxnGuHqyb88s8/HBX/xu o0XMpV23i0z/qTP2svTfD94s7R/XPgq9D/Y8tg2OaVJ9GbGoFejiNYOqziePF+qhbk1AQs yNnYARfX21fNXqNp4zV//q0yzvOThQ6+sA9N+zXJkU3X+8bPzrJsneVSiClB8Hb1ad2uFp 8EgBoD3c0x/SvjxkxoJYaIqvH+jVLWvO5FhnvCjbaWxXsecWt87rMj58gpcfqAQWq5zfrc wZ3w+xNYA/f6UesWdS4DCrnSqMvA4MJZsHiPefY1Clo08etoikD7ivaf2tw5hA== 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=1775577182; 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=SDGu9IPP8jSs+3SmBnZB7gRb2BeL+JC4uI3l/l4IvCw=; b=vD84ciG+Bq9mu+JGPW7EK32DiU3c4LPU3VrX5wVa0PfbZM5DW19Da4ygj6KBQYlxCslNv5 ai2Gd3fHMCxBiYVwLV2ITDb7aoTUf+CrQijrERXYjwoP8m+6uR1MKKoiHbfRS5CY7FOKs1 r38TyYcFHXGteJPeKH/mwUR2+JUkA62LWohg0g6Vq2UOp2V780Cj1VeKcwX/1bvW12a628 NFA78o2PueVGCFLtW+OWNpMJyWOQwmEZ1YHvSXkR4lxHwtDuI+7UflQhJZXrz28Ts1f4OP l+Mi8KKI4eLXGprukAjKTHB7XMHeoeElADFUCb7WHDUDaso45pxzs14UGqKRuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrM16g7TzmDy for ; Tue, 07 Apr 2026 15:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46681 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:53:01 +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: b3bf8410a562 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: b3bf8410a56260bc0f26b5197b3c8764f3283e9d Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:53:01 +0000 Message-Id: <69d5285d.46681.4c69a2fa@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3bf8410a56260bc0f26b5197b3c8764f3283e9d commit b3bf8410a56260bc0f26b5197b3c8764f3283e9d Author: Dag-Erling Smørgrav AuthorDate: 2026-04-01 17:14:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-07 15:52:56 +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 b7e902b6d9a7..84a779bc9dfc 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -184,6 +184,8 @@ cd9660_rrip_slink(p,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?"); @@ -257,6 +259,8 @@ cd9660_rrip_altname(p,ana) /* Inserting component */ wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; + if (wlen < 0) + wlen = ana->maxlen + 1; break; default: