From nobody Fri Dec 6 02:24:51 2024 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 4Y4FTJ0vtSz5g6g1; Fri, 06 Dec 2024 02:24:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4FTH6G5bz44T0; Fri, 6 Dec 2024 02:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733451891; 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=EUuAPfEKKUJEwRaYQX6lbZNS8idjoo/xrhNEZSAlM3E=; b=hb7rZI5lWiw93sK6UXU9ZiejzmxF0yAkrbPaA+Pdlzl4nbsaXlJoKQfoW/tYaSJ4+uHNvI lcxsxrZg1BkgY8XGyAtdg6WgHHDc+NTFNjx5g8WK1hYWVfp17CSk2kWeDvEiLJUkKults6 oZRKr2HVp1Lb0XOQ3LrE5g3iRP5vcMFk8cTzMUv2ZB6GzLzhk79xTe+CdVXWwHlsyZSy4N j0kcJTswDrElfK6a4rFlQBiVFIJra69+WuilVzUFiV0WDYKdoyalFXyvGTrnl4lqZUIXpi kGQTY5+G3UPz8TPOdqd3vGXnBLN6lyL7brs83VOBA6Ie+dgYb7XzrOkC9Uy8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733451891; 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=EUuAPfEKKUJEwRaYQX6lbZNS8idjoo/xrhNEZSAlM3E=; b=sssadpcPVdbrQxaKJehf57RKgAFmy2iwcnPAiO55MTDsPl3rn3m/gExrMHz3Rk5nWPm1lE 908nxLx5Sllp5zvhmaHHmZrrrY9HGVn8W5VBPesURa2JZhw9Fr9X+FcKmQdie2x51qBsxX 5q2ZSeCIVBDndlwWGirk1t84QB8Bc7p/kIK/GvJtUKhvlfzpG2CQOV90HDMhdh+wHXF4zI TY0hRgMKTO3NouEzLa2RZpxL+6eyKGiH7w8/fMvVbxBZw5vAmDQoCKmul9tYOPHTMvLZAj Z4FanBqX4a0FrGACl+7d7XkPOIWXbP4avgt8jlujbDDGcMBwzCSDIx7GZ763kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733451891; a=rsa-sha256; cv=none; b=JBBe0e7jMPNx4eiR5sNtZxOguqfF8ZtFxNtnhn3qKojUh6vy5SgoyNFS99iGgTnYD5VsMu Wu5Y92kGdn1Nc46L+B8Y8E3TraqMg5rSXGijHkYJwVIWCXc39lfnHg7B4J8FA0Vv6ajgwR jUohH4wBGFRMC8/KWnSFtmBxg9XG1Acz+nJgrUfrNRETXUw3OhMedzqNu5dl9InnKoMaG6 ZniWjj38GspUNepVorIWeoLC3riWkVLGjnkf0b/oGxwEqhvsWmqYxxlHiYphHPTgLqQOKt TNmXbyVF//4LZEQVlZxvhSJTH8mkmaFSaVa8Spwp42/qXTL2zhjydt7+JNi/cw== 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 4Y4FTH5sb4zK04; Fri, 6 Dec 2024 02:24:51 +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 4B62Op9X034688; Fri, 6 Dec 2024 02:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B62OpWg034685; Fri, 6 Dec 2024 02:24:51 GMT (envelope-from git) Date: Fri, 6 Dec 2024 02:24:51 GMT Message-Id: <202412060224.4B62OpWg034685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 205659c43d87 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 205659c43d87bd42c4a0819fde8f81e8ebba068e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=205659c43d87bd42c4a0819fde8f81e8ebba068e commit 205659c43d87bd42c4a0819fde8f81e8ebba068e Author: Mark Johnston AuthorDate: 2024-12-06 02:03:59 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 02:24:26 +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(). Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 --- 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 33ca58472490..c41fccb394c2 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -758,6 +758,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 a9733f62c077..9b737e261a63 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -267,7 +267,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))