From nobody Wed Jan 29 18:54:55 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 4Yjrtm6RbGz5lm5b; Wed, 29 Jan 2025 18:54:56 +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 4Yjrtl4Cm9z49qv; Wed, 29 Jan 2025 18:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176895; 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=V+cQCPpQSyPmgvnxl1Rg+CU4fUfALTUA1RKguIVM1AQ=; b=oXWIRp9Z41AvTyR+O/psz9UHfjEd0tc6clVaxpFGLuMySm9knua8fmrVuY/wP/Uu3PUCuy 0MAuMq6EYVTWORXqHpzh4ozk69/8y9lx5d8ZGk8YmY8/ZLInD/O/MiCgRKE7uijDhiXBeI mgccpeAXyV+vXVvkEcRETZyXJToT3NClmIuBDyQhuj3ec73CpU4CGkdw7Mhltt8k4aUJX5 Z6/LpBwJkT6ig3kpG14dV/lncEHT/iIJz4W/NfUrN7VMNiMJBGC/o2koXdzR0hEaNCvhXl TFXbVUiQtxT7tSPFovgRx8Q4m706SGL5FsyJ+GUGRMb/KNjPpd59we6GwYf2Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176895; 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=V+cQCPpQSyPmgvnxl1Rg+CU4fUfALTUA1RKguIVM1AQ=; b=EX9LqzEgnkEH2sco2qOdyhJLgPgh/7y8jw3tlAnpvL9QYviW2g3l7kbI7JBTtnUrECWy5N CesTniwxAx/9q47x5kJT2qlX32I+pA1/zJhGU/sFG7ld9jyAd6r6radsSUmmOgx4EsaDXz Fa8S+oHMD0KqmN2uugFJjrwR0t6E4G03U7q/ONOIaXFDcBQZG/vbVxiPYn+qVXIrhGduO0 r7cq2c1/y6kH3LI+0NfjnqMI/v1faqnqab7dkrAMq1L/3GJlTXBegAXAfU9VCnpwzv0iFW /6/cgeSCzn49A9B/d/D1n3YfFLoqLqLfmtaidhKfMhrxRScoAWtBa0o0i1jUQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176895; a=rsa-sha256; cv=none; b=Q4KLbA9ksQ6CfhAZ4h3XhevGkBzvfvn2p8SPIJu6/ABLf0oXFu8cfx4ZT2bAZU4J1wI6nC eBnF7TApWFDnsiFjcihug3U5SF00Nd09zJU1f9gwkuEbLe5+8aJppka0ZLIXHZfuWo+HGV D/T8NuvQN98sHrVDP25T0uQaV3lVVOJBE9rpKWnaneWXrLJHipxlh9eeiRzow3k1HR/mzq r3EfNbWTbYOQuIfJAhu79fJg1NjbnnhyKjIwisWtYtWfULODsA15KKYHaAwpr2lrNwunRj 14zTNjK9OVfrgVKLPpxfvAdlNX8gTG4eE4EyMNTnDj3H/qWe6CEl1dC5+WDwXw== 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 4Yjrtl3P2xz1j; Wed, 29 Jan 2025 18:54:55 +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 50TIst29064044; Wed, 29 Jan 2025 18:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TIstZJ064041; Wed, 29 Jan 2025 18:54:55 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:54:55 GMT Message-Id: <202501291854.50TIstZJ064041@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: 1f3cea9cc12c - releng/14.2 - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 1f3cea9cc12c881273c5cae89b299a431b498902 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f3cea9cc12c881273c5cae89b299a431b498902 commit 1f3cea9cc12c881273c5cae89b299a431b498902 Author: Rick Macklem AuthorDate: 2024-12-06 02:05:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:27:11 +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_ */