Commit f83a4f2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs fixes from Gao Xiang:

 - Fix invalid algorithm dereference in encoded extents

 - Add missing dax_break_layout_final(), since recent FSDAX fixes
   didn't cover EROFS

 - Arrange long xattr name prefixes more properly

* tag 'erofs-for-6.17-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: fix long xattr name prefix placement
  erofs: fix runtime warning on truncate_folio_batch_exceptionals()
  erofs: fix invalid algorithm for encoded extents
parents 5cd64d4f 1fcf686d

fs/erofs/erofs_fs.h

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#define EROFS_FEATURE_COMPAT_MTIME			0x00000002

#define EROFS_FEATURE_COMPAT_XATTR_FILTER		0x00000004

#define EROFS_FEATURE_COMPAT_SHARED_EA_IN_METABOX	0x00000008

#define EROFS_FEATURE_COMPAT_PLAIN_XATTR_PFX		0x00000010





/*

 * Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should

fs/erofs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ EROFS_FEATURE_FUNCS(metabox, incompat, INCOMPAT_METABOX) 
EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM)

EROFS_FEATURE_FUNCS(xattr_filter, compat, COMPAT_XATTR_FILTER)

EROFS_FEATURE_FUNCS(shared_ea_in_metabox, compat, COMPAT_SHARED_EA_IN_METABOX)

EROFS_FEATURE_FUNCS(plain_xattr_pfx, compat, COMPAT_PLAIN_XATTR_PFX)



static inline u64 erofs_nid_to_ino64(struct erofs_sb_info *sbi, erofs_nid_t nid)

{

fs/erofs/super.c

+12 −0
Original line number Diff line number Diff line
@@ -1018,10 +1018,22 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) 
	return 0;

}



static void erofs_evict_inode(struct inode *inode)

{

#ifdef CONFIG_FS_DAX

	if (IS_DAX(inode))

		dax_break_layout_final(inode);

#endif



	truncate_inode_pages_final(&inode->i_data);

	clear_inode(inode);

}



const struct super_operations erofs_sops = {

	.put_super = erofs_put_super,

	.alloc_inode = erofs_alloc_inode,

	.free_inode = erofs_free_inode,

	.evict_inode = erofs_evict_inode,

	.statfs = erofs_statfs,

	.show_options = erofs_show_options,

};

fs/erofs/xattr.c

+10 −3
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ int erofs_xattr_prefixes_init(struct super_block *sb) 
	erofs_off_t pos = (erofs_off_t)sbi->xattr_prefix_start << 2;

	struct erofs_xattr_prefix_item *pfs;

	int ret = 0, i, len;

	bool plain = erofs_sb_has_plain_xattr_pfx(sbi);



	if (!sbi->xattr_prefix_count)

		return 0;
@@ -490,9 +491,15 @@ int erofs_xattr_prefixes_init(struct super_block *sb) 
	if (!pfs)

		return -ENOMEM;



	if (sbi->packed_inode)

	if (!plain) {

		if (erofs_sb_has_metabox(sbi))

			(void)erofs_init_metabuf(&buf, sb, true);

		else if (sbi->packed_inode)

			buf.mapping = sbi->packed_inode->i_mapping;

		else

			plain = true;

	}

	if (plain)

		(void)erofs_init_metabuf(&buf, sb, false);



	for (i = 0; i < sbi->xattr_prefix_count; i++) {

fs/erofs/zmap.c

+37 −30
Original line number Diff line number Diff line
@@ -394,10 +394,10 @@ static int z_erofs_map_blocks_fo(struct inode *inode, 
		.map = map,

		.in_mbox = erofs_inode_in_metabox(inode),

	};

	int err = 0;

	unsigned int endoff, afmt;

	unsigned int endoff;

	unsigned long initial_lcn;

	unsigned long long ofs, end;

	int err;



	ofs = flags & EROFS_GET_BLOCKS_FINDTAIL ? inode->i_size - 1 : map->m_la;

	if (fragment && !(flags & EROFS_GET_BLOCKS_FINDTAIL) &&
@@ -482,20 +482,15 @@ static int z_erofs_map_blocks_fo(struct inode *inode, 
			err = -EFSCORRUPTED;

			goto unmap_out;

		}

		afmt = vi->z_advise & Z_EROFS_ADVISE_INTERLACED_PCLUSTER ?

			Z_EROFS_COMPRESSION_INTERLACED :

			Z_EROFS_COMPRESSION_SHIFTED;

		if (vi->z_advise & Z_EROFS_ADVISE_INTERLACED_PCLUSTER)

			map->m_algorithmformat = Z_EROFS_COMPRESSION_INTERLACED;

		else

			map->m_algorithmformat = Z_EROFS_COMPRESSION_SHIFTED;

	} else if (m.headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2) {

		map->m_algorithmformat = vi->z_algorithmtype[1];

	} else {

		afmt = m.headtype == Z_EROFS_LCLUSTER_TYPE_HEAD2 ?

			vi->z_algorithmtype[1] : vi->z_algorithmtype[0];

		if (!(EROFS_I_SB(inode)->available_compr_algs & (1 << afmt))) {

			erofs_err(sb, "inconsistent algorithmtype %u for nid %llu",

				  afmt, vi->nid);

			err = -EFSCORRUPTED;

			goto unmap_out;

		}

		map->m_algorithmformat = vi->z_algorithmtype[0];

	}

	map->m_algorithmformat = afmt;



	if ((flags & EROFS_GET_BLOCKS_FIEMAP) ||

	    ((flags & EROFS_GET_BLOCKS_READMORE) &&
@@ -626,9 +621,9 @@ static int z_erofs_fill_inode(struct inode *inode, struct erofs_map_blocks *map) 
{

	struct erofs_inode *const vi = EROFS_I(inode);

	struct super_block *const sb = inode->i_sb;

	int err, headnr;

	erofs_off_t pos;

	struct z_erofs_map_header *h;

	erofs_off_t pos;

	int err = 0;



	if (test_bit(EROFS_I_Z_INITED_BIT, &vi->flags)) {

		/*
@@ -642,7 +637,6 @@ static int z_erofs_fill_inode(struct inode *inode, struct erofs_map_blocks *map) 
	if (wait_on_bit_lock(&vi->flags, EROFS_I_BL_Z_BIT, TASK_KILLABLE))

		return -ERESTARTSYS;



	err = 0;

	if (test_bit(EROFS_I_Z_INITED_BIT, &vi->flags))

		goto out_unlock;
@@ -679,15 +673,6 @@ static int z_erofs_fill_inode(struct inode *inode, struct erofs_map_blocks *map) 
	else if (vi->z_advise & Z_EROFS_ADVISE_INLINE_PCLUSTER)

		vi->z_idata_size = le16_to_cpu(h->h_idata_size);



	headnr = 0;

	if (vi->z_algorithmtype[0] >= Z_EROFS_COMPRESSION_MAX ||

	    vi->z_algorithmtype[++headnr] >= Z_EROFS_COMPRESSION_MAX) {

		erofs_err(sb, "unknown HEAD%u format %u for nid %llu, please upgrade kernel",

			  headnr + 1, vi->z_algorithmtype[headnr], vi->nid);

		err = -EOPNOTSUPP;

		goto out_unlock;

	}



	if (!erofs_sb_has_big_pcluster(EROFS_SB(sb)) &&

	    vi->z_advise & (Z_EROFS_ADVISE_BIG_PCLUSTER_1 |

			    Z_EROFS_ADVISE_BIG_PCLUSTER_2)) {
@@ -726,6 +711,30 @@ static int z_erofs_fill_inode(struct inode *inode, struct erofs_map_blocks *map) 
	return err;

}



static int z_erofs_map_sanity_check(struct inode *inode,

				    struct erofs_map_blocks *map)

{

	struct erofs_sb_info *sbi = EROFS_I_SB(inode);



	if (!(map->m_flags & EROFS_MAP_ENCODED))

		return 0;

	if (unlikely(map->m_algorithmformat >= Z_EROFS_COMPRESSION_RUNTIME_MAX)) {

		erofs_err(inode->i_sb, "unknown algorithm %d @ pos %llu for nid %llu, please upgrade kernel",

			  map->m_algorithmformat, map->m_la, EROFS_I(inode)->nid);

		return -EOPNOTSUPP;

	}

	if (unlikely(map->m_algorithmformat < Z_EROFS_COMPRESSION_MAX &&

		     !(sbi->available_compr_algs & (1 << map->m_algorithmformat)))) {

		erofs_err(inode->i_sb, "inconsistent algorithmtype %u for nid %llu",

			  map->m_algorithmformat, EROFS_I(inode)->nid);

		return -EFSCORRUPTED;

	}

	if (unlikely(map->m_plen > Z_EROFS_PCLUSTER_MAX_SIZE ||

		     map->m_llen > Z_EROFS_PCLUSTER_MAX_DSIZE))

		return -EOPNOTSUPP;

	return 0;

}



int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,

			    int flags)

{
@@ -746,10 +755,8 @@ int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map, 
			else

				err = z_erofs_map_blocks_fo(inode, map, flags);

		}

		if (!err && (map->m_flags & EROFS_MAP_ENCODED) &&

		    unlikely(map->m_plen > Z_EROFS_PCLUSTER_MAX_SIZE ||

			     map->m_llen > Z_EROFS_PCLUSTER_MAX_DSIZE))

			err = -EOPNOTSUPP;

		if (!err)

			err = z_erofs_map_sanity_check(inode, map);

		if (err)

			map->m_llen = 0;

	}