overlayfs: Fix setting IOP_XATTR flag (655042cc) · Commits · 戴 / test

ovl_fill_super calls ovl_new_inode to create a root inode for the new superblock before initializing sb->s_xattr. This wrongly causes IOP_XATTR to be cleared in i_opflags of the new inode, causing SELinux to log the following message: SELinux: (dev overlay, type overlay) has no xattr support Fix this by initializing sb->s_xattr and similar fields before calling ovl_new_inode. Signed-off-by:

Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by:

Al Viro <viro@zeniv.linux.org.uk>

fs/overlayfs/super.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1292,6 +1292,12 @@ static int ovl_fill_super(struct super_block sb, void data, int silent)
		if (!oe)
		goto out_put_cred;

		sb->s_magic = OVERLAYFS_SUPER_MAGIC;
		sb->s_op = &ovl_super_operations;
		sb->s_xattr = ovl_xattr_handlers;
		sb->s_fs_info = ufs;
		sb->s_flags \|= MS_POSIXACL \| MS_NOREMOTELOCK;

		root_dentry = d_make_root(ovl_new_inode(sb, S_IFDIR));
		if (!root_dentry)
		goto out_free_oe;
		@@ -1315,12 +1321,7 @@ static int ovl_fill_super(struct super_block sb, void data, int silent)
		ovl_inode_init(d_inode(root_dentry), realinode, !!upperpath.dentry);
		ovl_copyattr(realinode, d_inode(root_dentry));

		sb->s_magic = OVERLAYFS_SUPER_MAGIC;
		sb->s_op = &ovl_super_operations;
		sb->s_xattr = ovl_xattr_handlers;
		sb->s_root = root_dentry;
		sb->s_fs_info = ufs;
		sb->s_flags \|= MS_POSIXACL \| MS_NOREMOTELOCK;

		return 0;

Admin message