Hi Dave, On Wed, 2017-12-13 at 08:13 +1100, Dave Chinner wrote: > On Tue, Dec 12, 2017 at 09:21:09AM -0500, Mimi Zohar wrote: > > Move the XFS_SB_MAGIC definition to magic.h. > > > > Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> > > --- > > fs/xfs/libxfs/xfs_format.h | 3 ++- > > include/uapi/linux/magic.h | 1 + > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h > > index 1acb584fc5f7..05f7d83e5f88 100644 > > --- a/fs/xfs/libxfs/xfs_format.h > > +++ b/fs/xfs/libxfs/xfs_format.h > > @@ -18,6 +18,8 @@ > > #ifndef __XFS_FORMAT_H__ > > #define __XFS_FORMAT_H__ > > > > +#include <linux/magic.h> > > + > > /* > > * XFS On Disk Format Definitions > > * > > @@ -38,7 +40,6 @@ struct xfs_ifork; > > * Fits into a sector-sized buffer at address 0 of each allocation group. > > * Only the first of these is ever updated except during growfs. > > */ > > -#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */ > > #define XFS_SB_VERSION_1 1 /* 5.3, 6.0.1, 6.1 */ > > #define XFS_SB_VERSION_2 2 /* 6.2 - attributes */ > > #define XFS_SB_VERSION_3 3 /* 6.2 - new inode version */ > > NAK. > > The XFS superblock magic number is part of the on-disk format > definition of XFS. It belongs with all the other on-disk format > definitions in this file. > > Besides, there is almost never a good reason to be doing stuff based > on filesystem magic numbers. What, exactly, do you need to know > filesystem magic numbers for in the kernel? IMA measures, appraises, and audits files based on policy. The builtin in measurement and appraisal policies can be defined on the boot command line (eg. ima_policy=tcb|appraise_tcb|secure_boot). These initial builtin policies are course grain. After the LSMs are enabled, the IMA policy can be defined in terms of the LSM labels and other file metadata (eg. UUID, uid, euid, fsmagic, ...). Normally the builtin policies are subsequently replaced with a custom policy in the initramfs. Mimi -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
