From nobody Wed Jan 29 18:55:21 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 4YjrvF5T8Vz5lmnm; Wed, 29 Jan 2025 18:55:21 +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 4YjrvF1zqpz3CRF; Wed, 29 Jan 2025 18:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176921; 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=4XIIIBKEonSgDPzmaKsGJCQ+jfrbE0B6YguKz3OqWrw=; b=Y5rwKKwXoC30kHRDBI0g8RYF9P9UHM3jZHupvAWk1UE7o+hyCZo9yT0hWBX3czdzfPS5SW jKRjIavYs0KWbqiy8gj3Akm0hmUNa62adtlmNRjhgVN8ipFDvchpJoeUje82uqTZCeSO8p 7IfPKlJilIMBWTVSoOS/0hCMCylvH+nBprjNqwtoDNjxpOz8lFPCJagmX9hzf6mtSVUR2C LJGqx0ySy+0C05X1gw76Kt+qckVrf1e0rxFwUecboCionZbLnJGL89HwZLF3EofQT9Frg2 bDmAT4a1NGEMtiHHzy3uM8tGbuR6yGRbe+AxGMuh2kxYnbbjWrDkmmcMNl5AEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176921; 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=4XIIIBKEonSgDPzmaKsGJCQ+jfrbE0B6YguKz3OqWrw=; b=H0z//IG2H4vhTNmfx8PtGfdWWUm9p2LZF1U3mWpCBITvw3qfcicLFsUBiW0ovK2wXMCLkH chjPTQWs/dfTppZSNyStSwfkFa923CtxTyxkF5tJ2M8UcxmQCAw0e4DrrPGe6wJSDpLkeR T8yYpmpyAIHWniAV13Gnmu9BKL91yBQ9ew2nDWZ1qGMMmtQTwKH0clLNP3EHsT4nPR0qOE Uzy042onI/08TPg8s78De6DQLGgILxi9LUIf+2fO9mi98Qz08DXyDjKUkntvciC+krbJN9 esiwb/OBplH9PNX0FBR5d8XMU8yWSUlmXFTFh0pZ+pdzRla9QWeNO5PCMQrYBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176921; a=rsa-sha256; cv=none; b=SRWQfX49GfkYfi8C4ipNADOr3JBWUeO6BlJ9qMSmC5pM6Ql9VqJHInHkCbESlrdF+SAwiN XSfHtVLTFtTAeQTRIiMVbVH9eRvbmLeL+dpjAMb1iPeohVhfkQUNpBAHEIeE8yN4bAXx32 gvRl+TrxelujH5gJYibaFSIbYGqA8eaXKhAwpYUvTcuHBekkxffs+tRrMvsqoT2yt1jXYh UE6J/luejMYQdHr9WiVa+GsniSqg4aLtH/+7jvU6vdyHchASQOsEAIulj3cQ6ywTGlanCa /KJcZ90oQ7DFsqXyXgevCuu770PMT4Wr8q93sC97TLEQdCQuBtSbsFpWbq/UvA== 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 4YjrvF1Rc4z1Cl5; Wed, 29 Jan 2025 18:55:21 +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 50TItLPX064579; Wed, 29 Jan 2025 18:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItLiv064576; Wed, 29 Jan 2025 18:55:21 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:21 GMT Message-Id: <202501291855.50TItLiv064576@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: f2cc3336ad40 - releng/14.1 - 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/14.1 X-Git-Reftype: branch X-Git-Commit: f2cc3336ad40603980d9ff0234c47cfdced03eca Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f2cc3336ad40603980d9ff0234c47cfdced03eca commit f2cc3336ad40603980d9ff0234c47cfdced03eca Author: Rick Macklem AuthorDate: 2024-12-06 02:05:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:12:14 +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 7a3a0402aeb626a7379addd344cbfd8900e83baa) --- 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_ */