From nobody Fri Jan 17 13:53:10 2025 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 4YZLm81qk4z5l16M; Fri, 17 Jan 2025 13:53:12 +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 4YZLm73dSGz3nGS; Fri, 17 Jan 2025 13:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121991; 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=3IhU2u2V86uJHLnfRxOe5+q9ppBekx+fd8SK+ve6wyU=; b=U89w92b4cv6JV3VpwSTUYLjwyss7MSm17EX+Wc59/7SBroFFNhXTGsNfnjOOsZb6WcXGpr 9QivNzDndJMbmcmfjpU5ytJzn4Ku1N/bJ0JOsaFeb63VE8KmKlKNrjVdo6WZKXymhKeMTi V5gyqineAXLYgc/esw58rL5u9sBIN0YX03rkJNjvtI7fd23h0sX8v4WrIGFrLZTETVYAQI O/oIfDbPoiYhcxmDrZQFknBDHgDKgafMyXE1JDdlxe8vfEz9PIr1/UdGKbPrGrT8bf7o/n yQrJtaqz2i83LTgbwPbxtn9mKCVWDDghtuO1VIVhgFhEevdINKQyPwyUEbO0BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121991; 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=3IhU2u2V86uJHLnfRxOe5+q9ppBekx+fd8SK+ve6wyU=; b=IUvsBIek59rxZ3aPKHB82khWCFHMFGTfGxLUlHXKITZexNOdduty+fmfQUdDYnuCR5onxa +QYy4ZWFOfYbRr0OjSnaL4a6X/cZUFZoXM4R3kAPIuDKi7rGRQcWXEiXFfdvzhsFSLZKAw wpTy3KpoX5XXR4fMo6v5gU6ywyw+VfJJzm0eJKcISlmCErA5r4ZphwnNmxaWcSAB5MQCOY hT/4wkFPV7F5RtKAu02OBolW/spUsG0N5Ojv4g35r19D/VXq7GTp1iOp0MX7uClgwSw9ZN IXmlXJbG+Ju6R662fRuQJ46q15ZFb1zB291lRncJGmW/RB8LnbD04j1SZ+lkuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737121991; a=rsa-sha256; cv=none; b=EpMyEwY6fMtxLmotKE9fmOcJkvBT8lvtNgVUsV3TSETl4gsg7x29uRl0D/q9eTI9/6GD7F GUDqBypFSssOFrRNAO8F31DnA8drQeLfEZ/PA56QFdXBy2U0PmD9nZQ1J1OtaXU8T87202 ovo/LG2uwE7sqSNsBdTHPdKRBM6vYO+33OBGJi5vBbZZ4R303DFZCpjwA8PCxur1sX3Pji kA37bqTpT0CKmxrGtoZro+InY6vleUeJxXGXjEZF+kiJHd6wR74ntXCtQEqaGmZUg5I/UF AFgt/FrdGiylvY6vh7Ia0HiOyv7vE3JlMoretTDWdeSCcpPQ9Ozdvn2+1Acvqw== 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 4YZLm70HvLz5TT; Fri, 17 Jan 2025 13:53:11 +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 50HDrA2m022567; Fri, 17 Jan 2025 13:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HDrABM022564; Fri, 17 Jan 2025 13:53:10 GMT (envelope-from git) Date: Fri, 17 Jan 2025 13:53:10 GMT Message-Id: <202501171353.50HDrABM022564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7a3a0402aeb6 - stable/14 - ext2fs: Fix the size of struct ufid and add a static assert 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a3a0402aeb626a7379addd344cbfd8900e83baa Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3a0402aeb626a7379addd344cbfd8900e83baa commit 7a3a0402aeb626a7379addd344cbfd8900e83baa Author: Rick Macklem AuthorDate: 2024-12-06 02:05:06 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 13:51:53 +0000 ext2fs: Fix the size of struct ufid and add a static assert 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 packed the structure and checks via a __Static_assert(). Reviewed by: markj MFC after: 2 weeks (cherry picked from commit bfc8e3308bee23d0f7836d57f32ed8d47da02627) --- sys/fs/ext2fs/ext2_vnops.c | 2 ++ sys/fs/ext2fs/inode.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index 1c4b62bb4086..79d50a6a64cb 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -1892,6 +1892,8 @@ ext2_vptofh(struct vop_vptofh_args *ap) { struct inode *ip; struct ufid *ufhp; + _Static_assert(sizeof(struct ufid) <= sizeof(struct fid), + "struct ufid cannot be larger than struct fid"); ip = VTOI(ap->a_vp); ufhp = (struct ufid *)ap->a_fhp; diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h index 46e6215aff6f..14d2d6454737 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -193,7 +193,7 @@ struct ufid { uint16_t ufid_pad; /* Force 32-bit alignment. */ ino_t ufid_ino; /* File number (ino). */ uint32_t ufid_gen; /* Generation number. */ -}; +} __packed; #endif /* _KERNEL */ #endif /* !_FS_EXT2FS_INODE_H_ */