summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2024-12-06 02:03:59 +0000
committerMark Johnston <markj@FreeBSD.org>2025-01-29 17:01:33 +0000
commitbb48aba6244c10236590b49e43fe90daab6a55fa (patch)
tree10c6d8916fa82274709f9b3145a3aa206d0eac4a
parenteb9d8bafa485988afe8005cc5fc818dfa39a01d9 (diff)
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c3
-rw-r--r--sys/fs/cd9660/iso.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 9598ecdd7712..60b33fa9a493 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -826,6 +826,9 @@ cd9660_pathconf(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))