From nobody Wed Jan 29 18:55:27 2025 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 4YjrvN3hr1z5lmpW; Wed, 29 Jan 2025 18:55:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjrvN11HWz3CjB; Wed, 29 Jan 2025 18:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176928; 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=mdqtpw+Vo6f1eKZN22ByMw1PRRI55hg3qYk7ZesocaY=; b=gz/zXyIYLVggPgRZT8CRBqZ3TPlGhHkCzzPBk0I6nFtw+7/RyJKfTqISYVAK3zX1fQUKaX A9Z6Y+wEfX/oI39fHev7vgPSSzON1HBRPsejqW4KoJwQph6zKy24SODmYxaGCs+lnamWGo zHFxvTPT8zNxbyvMLgyt19lzq7+YMrqJtp6TlKphv7vbmQzzYa0Usiq01mtPZI0yXzg7+i /cltXarBdpksvxSr+OO0sVMOcN0KWOWS5ST6ajdFj26jIKYKfmqO8vlOIh/yz6XQj4mOvg HWHOBJvwsVn/pmNHhpTENl2BM0vmi74UC1h8pRtUotiZeywWcpORrIS5kb3oig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176928; 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=mdqtpw+Vo6f1eKZN22ByMw1PRRI55hg3qYk7ZesocaY=; b=N12XwzDPAff4ZZOGgwAERjNC3mGTgBWNFSRL6+3auPC53YA1GHAzWbInE0nFeVC+Fe4u9x 5fwP+snetSsbixqteHxhuwomkDZAf4vAZ+Fg3iZH5FTPN+nWGA+RxTRhGC4A8/ZHz7Gy+6 3GHyFtCTPwJMDAb02jZxmiZIQ+sxtgx5yJiQ98wZp0pdVGZLxE46/qCworX54cZWi0TIQf WorX8iGNfaAB/y9hXsExhfb05EEtSoQPdW9ycLmd50H0GmjLhGCU4fIbhuM8kgBjleH9ha c2KG4G7avlLflqVWeD1sV1N4kLKR4RM699US75VphzeOttoG+C8N52vGSf3R6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176928; a=rsa-sha256; cv=none; b=oa0qIEocESCv4i7OAHacgWALIQ3k5g8J1J3RMa9Vv+/cMzvYvvU5E8a/cghdNisrqNMsOj WoX+8WDWhlqxtb6D1H2jyACLuRm4VO52Ousyj16lCvwYWh04JVo1D0j5qufw/MfCsXKtoC o1FYZFQPNgiNRLjomdBvG3/4CpKlB15u3gxknCQpzYSVAE70Yb4REUKGBHrM+VOzleQxdQ 5/tL66OFXG/iP1n4OlqXspAmnvWKAGxegfr9/vBCgPtdHLLC5L53AnWssIBOeqdz2Ww8R3 v83EQtC1gK04vqAkeHirLPMjRNLtG/lrCTOzZhfu0IxNBoWLLJpC/N2G68Rtdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjrvN0ctGz1ChV; Wed, 29 Jan 2025 18:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50TItRPH064995; Wed, 29 Jan 2025 18:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItRhT064992; Wed, 29 Jan 2025 18:55:27 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:27 GMT Message-Id: <202501291855.50TItRhT064992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bb48aba6244c - releng/13.4 - cd9660: Make sure that struct ifid fits in generic filehandle structure 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: bb48aba6244c10236590b49e43fe90daab6a55fa Auto-Submitted: auto-generated The branch releng/13.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb48aba6244c10236590b49e43fe90daab6a55fa commit bb48aba6244c10236590b49e43fe90daab6a55fa Author: Mark Johnston AuthorDate: 2024-12-06 02:03:59 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:01:33 +0000 cd9660: Make sure that struct ifid fits in generic filehandle structure File system specific *fid structures are copied into the generic struct fid defined in sys/mount.h. As such, they cannot be larger than struct fid. This patch packs the structure and checks via a __Static_assert(). Approved by: so Security: FreeBSD-SA-25:02.fs Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 (cherry picked from commit 205659c43d87bd42c4a0819fde8f81e8ebba068e) (cherry picked from commit cd597b4bb194f7a0bd756b5299b40ad3607b1baf) --- sys/fs/cd9660/cd9660_vnops.c | 3 +++ sys/fs/cd9660/iso.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 9598ecdd7712..60b33fa9a493 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -826,6 +826,9 @@ cd9660_pathconf(ap) /* NOTREACHED */ } +_Static_assert(sizeof(struct ifid) <= sizeof(struct fid), + "struct ifid must be no larger than struct fid"); + /* * Vnode pointer to File handle */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index bf98e75c42d9..b54f5f8e5cf4 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -269,7 +269,7 @@ struct ifid { u_short ifid_pad; cd_ino_t ifid_ino; long ifid_start; -}; +} __packed; #define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data))