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

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

Pull erofs fixes from Gao Xiang:
 "The main one is a KMSAN fix which addresses an issue introduced in
  this cycle so it'd be much better to fix before releasing, and the
  remaining one fixes VMA alignment for THP.

  Summary:

   - Fix a KMSAN uninit-value issue triggered by a crafted image

   - Fix VMA alignment for memory mapped files on THP"

* tag 'erofs-for-6.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: apply proper VMA alignment for memory mapped files on THP
  erofs: fix uninitialized page cache reported by KMSAN
parents df479350 4127caee

fs/erofs/data.c

+1 −0
Original line number Diff line number Diff line
@@ -447,5 +447,6 @@ const struct file_operations erofs_file_fops = { 
	.llseek		= generic_file_llseek,

	.read_iter	= erofs_file_read_iter,

	.mmap		= erofs_file_mmap,

	.get_unmapped_area = thp_get_unmapped_area,

	.splice_read	= filemap_splice_read,

};

fs/erofs/decompressor.c

+2 −1
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ static int z_erofs_transform_plain(struct z_erofs_decompress_req *rq, 
	unsigned int cur = 0, ni = 0, no, pi, po, insz, cnt;

	u8 *kin;



	DBG_BUGON(rq->outputsize > rq->inputsize);

	if (rq->outputsize > rq->inputsize)

		return -EOPNOTSUPP;

	if (rq->alg == Z_EROFS_COMPRESSION_INTERLACED) {

		cur = bs - (rq->pageofs_out & (bs - 1));

		pi = (rq->pageofs_in + rq->inputsize - cur) & ~PAGE_MASK;