From nobody Wed Jan 29 18:55:19 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 4YjrvF2pR4z5lmdR; 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 4YjrvD1QSwz3C8X; Wed, 29 Jan 2025 18:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176920; 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=6+2GgoVW3xwa9lYt8ZNozSDxLK+k2r9NmxnR0H+2Eq4=; b=tITahBCxXDYSK2U+9CYHm+9Mk+et1Ipf8Oq5ELD9H7Qi3vGIFfPaW4udhtojJpCyNJpExP WXBZU62WDQgIghd62xRoZninWivJy1TCkg/W75QB2iQLet7umYbB2qzHc3P6sELtBdLsSO BaE1u9QmMGfWk3yXnEJlNfoAl3ExUVJ21R91FFWdamSVxuey3la7NPnPYsx3QUWjXALRfK JRpq6rGuhS/C52o5t+ZjxUTpy/J9yqHA5uT1Vcec8+fy2C1eFmMyczwqHFeIiSz+eT9jqX 6zb9ECk4wtL3ZGVrcX6U+cre/kXVYiQS5BX20B8AdXcWnQ8oHzkO7LkpzwrLIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738176920; 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=6+2GgoVW3xwa9lYt8ZNozSDxLK+k2r9NmxnR0H+2Eq4=; b=Wj5p39TvyE4mcAOwB6WlgTMeKqFA4LFaQmu8vQQTBB3Bw9WACVtQ+R0sRXHLAnbS0nR8v7 y9KchF++ht9KBbKU19r59oRN+cQM8tQFe5RazqBVwDVukRRq/DuEoE0vgpJxfjFNeSezRT TDEHshYP/sozkxw9kk4o5fNvw7o9yOJ6fki/Ity+xu5YNY4B1F8zRJRlYWTGN4OnrmNopN enBeeyoAbIGU09ew/Dk6rbE5+l6TPpIUnvJ7FxNZcWquyLIZnSDl+KFMyC/M+ZndOJhRlZ HU3oHWz3sYZJNAcZkyh8RPLJjlt+7r3XjEe87ZVQYIsaBR56fLm3YNJO5XybuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738176920; a=rsa-sha256; cv=none; b=ix7dNc7uKqcI2nRwy0Z7yiohVNdDJYBDBINaWpth6d4jIhFmfs3bIOMOL85wDOVYciCnQR MRdc5XLiD58S9ycN+DN2dXVZ89faJIgMgq4cjbsCSm56dTzI6vOalcsGoOKryIEBDSZAup rl+KkG2X2EtJSGykxLVC1Bdko7AC0ZolEeH+MMt4C3BhOrc602Kzjvv6jabfxZsScxIvg7 ctv91CuC9N3JH6vzI6RYeg/jC1XS2h4D69MN7OUHsZJyHG4/SJFfW0vTk+sankJKrq5iT8 X0dodwN15JH32siwuRQWkKOBpK5g7LBIJCLln8msVuTTkSCNzB4E6+mfpx8s1Q== 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 4YjrvD0TwQz1CqW; Wed, 29 Jan 2025 18:55:20 +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 50TItJh1064544; Wed, 29 Jan 2025 18:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TItJem064541; Wed, 29 Jan 2025 18:55:19 GMT (envelope-from git) Date: Wed, 29 Jan 2025 18:55:19 GMT Message-Id: <202501291855.50TItJem064541@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: d8083f5425fd - releng/14.1 - cd9660: Make sure that struct ifid fits in generic filehandle structure 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.1 X-Git-Reftype: branch X-Git-Commit: d8083f5425fd486aad2d6178ce8c0545f0cb6957 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8083f5425fd486aad2d6178ce8c0545f0cb6957 commit d8083f5425fd486aad2d6178ce8c0545f0cb6957 Author: Mark Johnston AuthorDate: 2024-12-06 02:03:59 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 17:11:57 +0000 cd9660: Make sure that struct ifid fits in generic filehandle structure 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 Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 (cherry picked from commit 205659c43d87bd42c4a0819fde8f81e8ebba068e) (cherry picked from commit 54974e731f279941ef7aebd7d30ba2e9299a4056) --- sys/fs/cd9660/cd9660_vnops.c | 3 +++ sys/fs/cd9660/iso.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index cb619379e2cc..31dacb392a6b 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -761,6 +761,9 @@ cd9660_pathconf(struct vop_pathconf_args *ap) /* NOTREACHED */ } +_Static_assert(sizeof(struct ifid) <= sizeof(struct fid), + "struct ifid must be no larger than struct fid"); + /* * Vnode pointer to File handle */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index bf98e75c42d9..b54f5f8e5cf4 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -269,7 +269,7 @@ struct ifid { u_short ifid_pad; cd_ino_t ifid_ino; long ifid_start; -}; +} __packed; #define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data))