Date: Fri, 6 Dec 2024 02:40:28 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Rick Macklem <rmacklem@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: bfc8e3308bee - main - ext2fs: Fix the size of struct ufid and add a static assert Message-ID: <C69375D0-E5C4-4571-BDE2-5CC796C9E597@freebsd.org> In-Reply-To: <202412060206.4B6266Ja096452@gitrepo.freebsd.org> References: <202412060206.4B6266Ja096452@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 Dec 2024, at 02:06, Rick Macklem <rmacklem@FreeBSD.org> wrote: >=20 > The branch main has been updated by rmacklem: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dbfc8e3308bee23d0f7836d57f32ed8d4= 7da02627 >=20 > commit bfc8e3308bee23d0f7836d57f32ed8d47da02627 > Author: Rick Macklem <rmacklem@FreeBSD.org> > AuthorDate: 2024-12-06 02:05:06 +0000 > Commit: Rick Macklem <rmacklem@FreeBSD.org> > CommitDate: 2024-12-06 02:05:06 +0000 >=20 > ext2fs: Fix the size of struct ufid and add a static assert >=20 > 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. >=20 > This patch packed the structure and checks via a __Static_assert(). >=20 > Reviewed by: markj > MFC after: 2 weeks > --- > sys/fs/ext2fs/ext2_vnops.c | 2 ++ > sys/fs/ext2fs/inode.h | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c > index dfbb11f75421..064c10bd18b2 100644 > --- a/sys/fs/ext2fs/ext2_vnops.c > +++ b/sys/fs/ext2fs/ext2_vnops.c > @@ -1889,6 +1889,8 @@ ext2_vptofh(struct vop_vptofh_args *ap) > { > struct inode *ip; > struct ufid *ufhp; > + _Static_assert(sizeof(struct ufid) <=3D sizeof(struct fid), > + "struct ufid cannot be larger than struct fid"); >=20 > ip =3D VTOI(ap->a_vp); > ufhp =3D (struct ufid *)ap->a_fhp; > diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h > index 9ee1b5672da6..63102deb10b0 100644 > --- a/sys/fs/ext2fs/inode.h > +++ b/sys/fs/ext2fs/inode.h > @@ -191,7 +191,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; Why not just swap ufid_ino and ufid_gen? This will give worse codegen on architectures that don=E2=80=99t assume fast unaligned access. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C69375D0-E5C4-4571-BDE2-5CC796C9E597>