From nobody Wed Jan 29 18:54:56 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 4Yjrtn3zMKz5lmbh; Wed, 29 Jan 2025 18:54:57 +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 4Yjrtm4cSPz49r2; Wed, 29 Jan 2025 18:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176896; 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=y1PCEgxK4JVd9zTDZbccVxYFeKfhRvNm4yq8CljTRpo=; b=Vp2m3CL1dPKGEbRtqwEb9KIUHVf2HbAXca2+QTjTPPKPMnpdC9XY3MLa3w5zBz9xYcRlvQ RC5T8vyJpXWVC6ayVQqTUeQkPGgthMjxFaZ9Nve+Z3QR4ECsD0yorpBIbbEvw4DtF0PeLn bqkA4E1OeZlKKY5KcmghFyMgQC4dNiPC9CZ1U6kPAtL6Lu5OAJKlbjQVmDp9n6cS4IllkA nOosVv38Ot432uGGd61GrV8Ui89hGVlOxXZlpGl0mF21mJw441zzq7AEwRAKaOPir9u3BY 5y/TTz/ZUwtKTRHMt2iYOdiL01+fxXDnqLw+vu9tI6OBSFq9ls5gjkGNzs3wdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176896; 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=y1PCEgxK4JVd9zTDZbccVxYFeKfhRvNm4yq8CljTRpo=; b=WKxi75G8OoT1xwphJ2y6inyewzJY/9H8donzwVhoo4pthw9MOlTHgcI7yU25azUorMdHze acGRVrt66sHR9mlffgwi7643044s7oL4NIsy2L1HFtZUmq2TZ/q7vFyp0Rs30c1WQBbwL/ +UP2SwOJPyO5/31POsE5JggjB7v6TsuKza2vpgEfxCcBgjfHm+K4rSBQt8nn3/LibfTSaP mKmCFYPliPAdfd9NbZmvOdlZJCB7mgujQXJmL485aVrB9emwmSdO6z9jX57L22BiaSb4tA 07S0tDWv+8vtcMwEVy/4Q7LqnvG05cxnw5p+Y+Pa6RjRyVqK3U5j/M7wJzuVBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176896; a=rsa-sha256; cv=none; b=YX0j2Zq7Keuez5MQHkw/7hkLY3pmDsrHVE7zij3nYpu9PAGwLGKbkM3LQWc+NIYvaB+4Gk 6kQvRbySojAMvATFg05jF7TXC/iDy2tprpk9yDxF2UJnn68B05Wn2iSue1L8ZefKfpfyVb qmpjUyOaDfO0mmeT4OrE2pCrMG4fB1n3RplWbaHgj6XRkcCSsfFxHiGsNzEp5/JR4NPG7W M55C3N4OX3cRq/zzkrRGUD8gHW39ea22t5VAHaj/phXwYESnguR0PBI0RbY7YDcOMEpTYB LSc/hZgy2Totv3cnilx4qJwQu7ielP2D7uJ55N4PWxEZUqQs7OnwRBKny+Flww== 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 4Yjrtm499Qz1ChL; Wed, 29 Jan 2025 18:54:56 +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 50TIsuIh064085; Wed, 29 Jan 2025 18:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TIsuC1064082; Wed, 29 Jan 2025 18:54:56 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:54:56 GMT Message-Id: <202501291854.50TIsuC1064082@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: faa47d299a0e - releng/14.2 - tarfs: Fix the size of struct tarfs_fid 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.2 X-Git-Reftype: branch X-Git-Commit: faa47d299a0ed3af49989495bd1debd469dc54e2 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=faa47d299a0ed3af49989495bd1debd469dc54e2 commit faa47d299a0ed3af49989495bd1debd469dc54e2 Author: Rick Macklem AuthorDate: 2024-12-06 02:09:27 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:27:27 +0000 tarfs: Fix the size of struct tarfs_fid 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 packs 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 4db1b113b15158c7d134df83e7a7201cf46d459b) (cherry picked from commit 155987e2019089a5bd2eef77ed7bcc5cc26c362e) --- sys/fs/tarfs/tarfs.h | 2 +- sys/fs/tarfs/tarfs_vnops.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs.h b/sys/fs/tarfs/tarfs.h index ff1985e488cd..ffb95d2c0ac5 100644 --- a/sys/fs/tarfs/tarfs.h +++ b/sys/fs/tarfs/tarfs.h @@ -165,7 +165,7 @@ struct tarfs_fid { u_short data0; /* force alignment */ ino_t ino; unsigned long gen; -}; +} __packed; #define TARFS_NODE_LOCK(tnp) \ mtx_lock(&(tnp)->lock) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index f2828c60f8a7..4bc923ed8f9c 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -668,6 +668,8 @@ tarfs_vptofh(struct vop_vptofh_args *ap) { struct tarfs_fid *tfp; struct tarfs_node *tnp; + _Static_assert(sizeof(struct tarfs_fid) <= sizeof(struct fid), + "struct tarfs_fid cannot be larger than struct fid"); tfp = (struct tarfs_fid *)ap->a_fhp; tnp = VP_TO_TARFS_NODE(ap->a_vp);