Unverified Commit 566918dc authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4789 v2 fix CVE-2024-26590 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2M7NM3PUABYYZHA2Y64Z2F3BODAQO76N/ 
Gao Xiang (2):
  erofs: simplify compression configuration parser
  erofs: fix inconsistent per-file compression format


-- 
2.31.1
 
https://gitee.com/src-openeuler/kernel/issues/I932VX 
 
Link:https://gitee.com/openeuler/kernel/pulls/4789

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents af1d1823 cc241ce4

fs/erofs/compress.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ struct z_erofs_decompress_req { 
};



struct z_erofs_decompressor {

	int (*config)(struct super_block *sb, struct erofs_super_block *dsb,

		      void *data, int size);

	int (*decompress)(struct z_erofs_decompress_req *rq,

			  struct page **pagepool);

	char *name;
@@ -92,6 +94,10 @@ int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf, 
extern const struct z_erofs_decompressor erofs_decompressors[];



/* prototypes for specific algorithms */

int z_erofs_load_lzma_config(struct super_block *sb,

			struct erofs_super_block *dsb, void *data, int size);

int z_erofs_load_deflate_config(struct super_block *sb,

			struct erofs_super_block *dsb, void *data, int size);

int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,

			    struct page **pagepool);

int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,

fs/erofs/decompressor.c

+59 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ struct z_erofs_lz4_decompress_ctx { 
	unsigned int oend;

};



int z_erofs_load_lz4_config(struct super_block *sb,

			    struct erofs_super_block *dsb,

			    struct z_erofs_lz4_cfgs *lz4, int size)

static int z_erofs_load_lz4_config(struct super_block *sb,

			    struct erofs_super_block *dsb, void *data, int size)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	struct z_erofs_lz4_cfgs *lz4 = data;

	u16 distance;



	if (lz4) {
@@ -370,19 +370,75 @@ const struct z_erofs_decompressor erofs_decompressors[] = { 
		.name = "interlaced"

	},

	[Z_EROFS_COMPRESSION_LZ4] = {

		.config = z_erofs_load_lz4_config,

		.decompress = z_erofs_lz4_decompress,

		.name = "lz4"

	},

#ifdef CONFIG_EROFS_FS_ZIP_LZMA

	[Z_EROFS_COMPRESSION_LZMA] = {

		.config = z_erofs_load_lzma_config,

		.decompress = z_erofs_lzma_decompress,

		.name = "lzma"

	},

#endif

#ifdef CONFIG_EROFS_FS_ZIP_DEFLATE

	[Z_EROFS_COMPRESSION_DEFLATE] = {

		.config = z_erofs_load_deflate_config,

		.decompress = z_erofs_deflate_decompress,

		.name = "deflate"

	},

#endif

};



int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	struct erofs_buf buf = __EROFS_BUF_INITIALIZER;

	unsigned int algs, alg;

	erofs_off_t offset;

	int size, ret = 0;



	if (!erofs_sb_has_compr_cfgs(sbi)) {

		sbi->available_compr_algs = 1 << Z_EROFS_COMPRESSION_LZ4;

		return z_erofs_load_lz4_config(sb, dsb, NULL, 0);

	}



	sbi->available_compr_algs = le16_to_cpu(dsb->u1.available_compr_algs);

	if (sbi->available_compr_algs & ~Z_EROFS_ALL_COMPR_ALGS) {

		erofs_err(sb, "unidentified algorithms %x, please upgrade kernel",

			  sbi->available_compr_algs & ~Z_EROFS_ALL_COMPR_ALGS);

		return -EOPNOTSUPP;

	}



	erofs_init_metabuf(&buf, sb);

	offset = EROFS_SUPER_OFFSET + sbi->sb_size;

	alg = 0;

	for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {

		void *data;



		if (!(algs & 1))

			continue;



		data = erofs_read_metadata(sb, &buf, &offset, &size);

		if (IS_ERR(data)) {

			ret = PTR_ERR(data);

			break;

		}



		if (alg >= ARRAY_SIZE(erofs_decompressors) ||

		    !erofs_decompressors[alg].config) {

			erofs_err(sb, "algorithm %d isn't enabled on this kernel",

				  alg);

			ret = -EOPNOTSUPP;

		} else {

			ret = erofs_decompressors[alg].config(sb,

					dsb, data, size);

		}



		kfree(data);

		if (ret)

			break;

	}

	erofs_put_metabuf(&buf);

	return ret;

}

fs/erofs/decompressor_deflate.c

+3 −2
Original line number Diff line number Diff line
@@ -77,9 +77,10 @@ int __init z_erofs_deflate_init(void) 
}



int z_erofs_load_deflate_config(struct super_block *sb,

				struct erofs_super_block *dsb,

				struct z_erofs_deflate_cfgs *dfl, int size)

			struct erofs_super_block *dsb, void *data, int size)

{

	struct z_erofs_deflate_cfgs *dfl = data;



	if (!dfl || size < sizeof(struct z_erofs_deflate_cfgs)) {

		erofs_err(sb, "invalid deflate cfgs, size=%u", size);

		return -EINVAL;

fs/erofs/decompressor_lzma.c

+2 −2
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ int __init z_erofs_lzma_init(void) 
}



int z_erofs_load_lzma_config(struct super_block *sb,

			     struct erofs_super_block *dsb,

			     struct z_erofs_lzma_cfgs *lzma, int size)

			struct erofs_super_block *dsb, void *data, int size)

{

	static DEFINE_MUTEX(lzma_resize_mutex);

	struct z_erofs_lzma_cfgs *lzma = data;

	unsigned int dict_size, i;

	struct z_erofs_lzma *strm, *head = NULL;

	int err;

fs/erofs/internal.h

+1 −37
Original line number Diff line number Diff line
@@ -469,9 +469,6 @@ int __init z_erofs_init_zip_subsystem(void); 
void z_erofs_exit_zip_subsystem(void);

int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,

				       struct erofs_workgroup *egrp);

int z_erofs_load_lz4_config(struct super_block *sb,

			    struct erofs_super_block *dsb,

			    struct z_erofs_lz4_cfgs *lz4, int len);

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

			    int flags);

void *erofs_get_pcpubuf(unsigned int requiredpages);
@@ -480,6 +477,7 @@ int erofs_pcpubuf_growsize(unsigned int nrpages); 
void __init erofs_pcpubuf_init(void);

void erofs_pcpubuf_exit(void);

int erofs_init_managed_cache(struct super_block *sb);

int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb);

#else

static inline void erofs_shrinker_register(struct super_block *sb) {}

static inline void erofs_shrinker_unregister(struct super_block *sb) {}
@@ -487,16 +485,6 @@ static inline int erofs_init_shrinker(void) { return 0; } 
static inline void erofs_exit_shrinker(void) {}

static inline int z_erofs_init_zip_subsystem(void) { return 0; }

static inline void z_erofs_exit_zip_subsystem(void) {}

static inline int z_erofs_load_lz4_config(struct super_block *sb,

				  struct erofs_super_block *dsb,

				  struct z_erofs_lz4_cfgs *lz4, int len)

{

	if (lz4 || dsb->u1.lz4_max_distance) {

		erofs_err(sb, "lz4 algorithm isn't enabled");

		return -EINVAL;

	}

	return 0;

}

static inline void erofs_pcpubuf_init(void) {}

static inline void erofs_pcpubuf_exit(void) {}

static inline int erofs_init_managed_cache(struct super_block *sb) { return 0; }
@@ -505,41 +493,17 @@ static inline int erofs_init_managed_cache(struct super_block *sb) { return 0; } 
#ifdef CONFIG_EROFS_FS_ZIP_LZMA

int __init z_erofs_lzma_init(void);

void z_erofs_lzma_exit(void);

int z_erofs_load_lzma_config(struct super_block *sb,

			     struct erofs_super_block *dsb,

			     struct z_erofs_lzma_cfgs *lzma, int size);

#else

static inline int z_erofs_lzma_init(void) { return 0; }

static inline int z_erofs_lzma_exit(void) { return 0; }

static inline int z_erofs_load_lzma_config(struct super_block *sb,

			     struct erofs_super_block *dsb,

			     struct z_erofs_lzma_cfgs *lzma, int size) {

	if (lzma) {

		erofs_err(sb, "lzma algorithm isn't enabled");

		return -EINVAL;

	}

	return 0;

}

#endif	/* !CONFIG_EROFS_FS_ZIP_LZMA */



#ifdef CONFIG_EROFS_FS_ZIP_DEFLATE

int __init z_erofs_deflate_init(void);

void z_erofs_deflate_exit(void);

int z_erofs_load_deflate_config(struct super_block *sb,

				struct erofs_super_block *dsb,

				struct z_erofs_deflate_cfgs *dfl, int size);

#else

static inline int z_erofs_deflate_init(void) { return 0; }

static inline int z_erofs_deflate_exit(void) { return 0; }

static inline int z_erofs_load_deflate_config(struct super_block *sb,

			struct erofs_super_block *dsb,

			struct z_erofs_deflate_cfgs *dfl, int size) {

	if (dfl) {

		erofs_err(sb, "deflate algorithm isn't enabled");

		return -EINVAL;

	}

	return 0;

}

#endif	/* !CONFIG_EROFS_FS_ZIP_DEFLATE */



#ifdef CONFIG_EROFS_FS_ONDEMAND