From nobody Wed Jan 29 18:55:29 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 4YjrvQ0TJGz5lmm7; Wed, 29 Jan 2025 18:55:30 +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 4YjrvP1HGvz3CjS; Wed, 29 Jan 2025 18:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176929; 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=UuyTv+vxrQ4yBZGKoa5fAthq3pQCRj+3vcs2OebbrfU=; b=YeTsfE2RWaarAIiv062K+k5HD4e8STX+J9Ygt/fkt6TBeaijiDa8kixdLeX1wiw20LZWMv JFJ1ySLideaZqCpPpRDFf6R8aIhA4y2t2Ku/4CdS/RNUUQXsR1CEbtPbtKh39lrd5s00uZ NFODjJ7zHSS97AXz0DG9kHJ4FT0H7rKx7AVI1jpE2UMGs1UV+X4eYXzvWtDnP5VSGCskOx zxB6nbSb6SBTdi7ergYJUxopVk3SLdisTIPVX+YXVcBROKAeX8ahEr4Vtlt9lamwjvoUUh LNrh2FDMBtDDtmhpwqOgkKCe01W/X3S63Mdt0BdpQD3VO4mApbJtwjrZzY+Njg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176929; 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=UuyTv+vxrQ4yBZGKoa5fAthq3pQCRj+3vcs2OebbrfU=; b=ma6V5rm1Fhs5+XoPiZoDjZ5mcf73IoQtW87+D91LeT52DIo1cGkX8oe3AgGHf0JrFu58jV ULLlyXIhtEz1v+ORRqQaT+niYWz09xEQ6Dsxjd/dHKC9x6QeCqhd362vnFl2+oiAYJ6Yhh jcytci4glcqLHT1onz/S0pQMYWG2ZmLUbcRTneMqUq5Zob7RRjSkQxH02cg4kT5XAk3Kfj x7DDT85L1G7qzwKEVwi6q16sR6pZmJ6kFFIXVPrw6cKQZ0DupeqLfIPl05Wqu6G8uy+Mk+ vuLG7hBaHZAznO6VQdX5ra3TBpmONZJTUO2lZoWtcHZqr9PexRmeLWU3sPSC/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176929; a=rsa-sha256; cv=none; b=jy0e8FVm+rPfFu8VHhJZ1plLRjtoZGfkX/UAq74LCPHbY2zV4QELinOcV6J3vf+chLz1aE eEWN0FT7ae4mF04vKiliwm68sWB8OP16MnaPZXKck6PF0SbC6fWMoPzFVTC30n8ypq2+/0 hin+kMCOOaqjyxpGriOUweb575dcNLfvHMaHB40BOV4UfGaqaTSFo6UwVqpM/R+k0OezJC uyBwG25+95bN5H1rr030vnavQ6zTbpTGmmdzLodxC1EfjFLaOaFrVvkAgeZ7b5swVTuHNY mWvQ9LgIyI9yyVS/ruaMDzYUBKM8CBf7/Bd+C/at7HKuPT+K5rgtY/UzNsq7qQ== 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 4YjrvP0tbDz1Cl8; Wed, 29 Jan 2025 18:55:29 +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 50TItTai065097; Wed, 29 Jan 2025 18:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItTWC065080; Wed, 29 Jan 2025 18:55:29 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:29 GMT Message-Id: <202501291855.50TItTWC065080@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: 0365b776f1b1 - releng/13.4 - ext2fs: Fix the size of struct ufid and add a static assert 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: 0365b776f1b189855c67bdfa2be38955039f8ed6 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0365b776f1b189855c67bdfa2be38955039f8ed6 commit 0365b776f1b189855c67bdfa2be38955039f8ed6 Author: Rick Macklem AuthorDate: 2024-12-06 02:05:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:02:12 +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(). Approved by: so Security: FreeBSD-SA-25:02.fs Reviewed by: markj MFC after: 2 weeks (cherry picked from commit bfc8e3308bee23d0f7836d57f32ed8d47da02627) (cherry picked from commit ee931cf4a49c90487c938fa14b856401582a045c) --- 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 01b94abf6cd5..63c4830b95be 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -1884,6 +1884,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 6b8b23ccab14..c29a64be12e0 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -189,7 +189,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_ */