From nobody Thu Oct 08 20:43:36 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 4j125P1D8zz4n2lh for ; Thu, 08 Oct 2026 20:43:37 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j125P0Fpmz4bQy for ; Thu, 08 Oct 2026 20:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492217; 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=BTFn8wuqzwuTSIj/DplsZmlg0JvQAzYJNupzyRZp55Y=; b=YdBeVdZuRgKVUx0NZm4l00+5Kn5Xnarha/zfPxNuEYOKbCZkIBMYeAggLuV819LuCyXhTT wbbZ3Ejm33uMB+cdYc2JFKvC/LL5dYZP3f7tr3D0y/hiOpFuKFny9QsTHEyd0Lpq41Bw0i Lt5/l9X1wEdGU2rB4fKWJgy2cCzBJsdjj74qW1I80VhJrkYkzQO3jKftoDxzt76PVpYgpR rGW33hLyOfcnmb5H2DkxqjXB/Kqw/kZhDx6FDBlJSjVxWIfl9H4A589uHy4FhcP18D+ym9 gz90Dps924Y3t/rIMbF4cvvV/2ZT/g8EQsksWqTYLzVC7O02LsKpLbmY9lQgag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492217; b=LUsajRRR5ULBxhzmC6H2+Za+DEn4dvDNXuhP9NOuSgeB78wjLv3d66E3EHIoutqHLuxBbc Qp7n7qDS5n4rAuDHiN2uKgcao0JEVo2ZRhI7rcxzfelE9OlfPsxdFWhb07JzX5ci0Fma0A 3v33sC8DlXtxLCWAblTVu1AIHvlkkbx0XhuXqUQ06ktnr8kKpx2QWtHRQitxyZCM5H3XRt QrXKz7VymChzseH0njgp/NJ46CJ75TgEqI+PJJHEFo1uXdUFjZUC1DqVR3cpaQ17aQ0y/F RUsLZCilqlnyO+ucpV2qIiy80+wsFBTNr7PHvNEjUDJgLjZaX4u+fnKHvtXggA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492217; 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=BTFn8wuqzwuTSIj/DplsZmlg0JvQAzYJNupzyRZp55Y=; b=lDjXrqKRoNgOgbL9LGLR5KmqVHbBiWhgAGA5FzXKVdEFaUwx+Bms9QxYFuikP32LXr3eTc QqcMcS+jVb0asdwf4FXGr4c/F9C+4LetyQsKCqzIgkL05YqbRt6EfqdQjWRCaM5RDM3RcS lt7WGQR425DreVQL7+k0aO69yPYiCSQSaG5YsmkF8+H4hvCt5YSa88Mot81FN2Gxc4tj1K nYy8siNWmn7fYd79pKXWonQKSgqH2ZkKPp3sDA+IbJ2d+bKETKukSd8nWFNZIqZ/YC2r8Z OYNpr3YtQglyFh9eaBB2TKctv2Bo0T4Y9gc6540nYrPbjybuh2Jb2f/MlYiIpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j125N6QbLzwRj for ; Thu, 08 Oct 2026 20:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4cbff57e8f86 - stable/15 - cd9660: Don't parse RRIP records whose length overflows the sector boundary 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4cbff57e8f8604682595b8d1801f66adf25603fd Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:36 +0000 Message-Id: <6ac80078.31a4c.4ee61939@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4cbff57e8f8604682595b8d1801f66adf25603fd commit 4cbff57e8f8604682595b8d1801f66adf25603fd Author: John Baldwin AuthorDate: 2026-06-10 13:44:10 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:30 +0000 cd9660: Don't parse RRIP records whose length overflows the sector boundary PR: 272896 Reported by: Robert Morris Reviewed by: des, emaste Differential Revision: https://reviews.freebsd.org/D57135 (cherry picked from commit 0492dbe9212ee0172e8003c487f256015478edd6) --- sys/fs/cd9660/cd9660_rrip.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 9bc8ef655368..db87f6d1223e 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -464,6 +464,7 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, RRIP_TABLE *ptable; ISO_SUSP_HEADER *phead; ISO_SUSP_HEADER *pend; + ISO_SUSP_HEADER *pnext; struct buf *bp = NULL; char *pwhead; u_short c; @@ -495,6 +496,21 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, * Note: "pend" should be more than one SUSP header */ while (pend >= phead + 1) { + /* Validate length. */ + if (isonum_711(phead->length) < sizeof(*phead)) + break; + + /* + * Next SUSP + * Hopefully this works with newer versions, too + */ + pnext = (ISO_SUSP_HEADER *)((char *)phead + + isonum_711(phead->length)); + + /* If the record doesn't fit, break out of the loop. */ + if (pnext > pend) + break; + if (isonum_711(phead->version) == 1) { for (ptable = table; ptable->func; ptable++) { if (phead->type[0] == ptable->type[0] && @@ -510,14 +526,8 @@ cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, result &= ~ISO_SUSP_STOP; break; } - /* plausibility check */ - if (isonum_711(phead->length) < sizeof(*phead)) - break; - /* - * move to next SUSP - * Hopefully this works with newer versions, too - */ - phead = (ISO_SUSP_HEADER *)((char *)phead + isonum_711(phead->length)); + + phead = pnext; } if (ana->fields && ana->iso_ce_len) {