Skip to contentSkip to conversation

erofs updates for 7.1-rc1

GIT PULL Merged Gao Xiang 2 participants 2 messages Apr 13 – Apr 14

lore
Share & tools
lore

Gao Xiang

author
#0 lore raw

Hi Linus,

Could you consider this pull request for 7.1-rc1?

No outstanding feature for this cycle and there are small random fixes as below. No potential merge conflict is observed.

Thanks,
Gao Xiang

The following changes since commit 7aaa8047eafd0bd628065b15757d9b48c5f9c07d:

Linux 7.0-rc6 (2026-03-29 15:40:00 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-7.1-rc1

for you to fetch changes up to a5242d37c83abe86df95c6941e2ace9f9055ffcb:

erofs: error out obviously illegal extents in advance (2026-04-10 16:53:39 +0800)

----------------------------------------------------------------
Changes since last update:

- Validate xattr h_shared_count to report -EFSCORRUPTED explicitly for crafted images

- Verify metadata accesses for file-backed mounts via rw_verify_area()

- Fix FS_IOC_GETFSLABEL to include the trailing NUL byte, consistent with ext4 and xfs

- Properly handle 48-bit on-disk blocks/uniaddr for extra devices

- Fix an index underflow in the LZ4 in-place decompression that can cause out-of-bounds accesses with crafted images

- Minor fixes and cleanups

----------------------------------------------------------------
Gao Xiang (3):
erofs: verify metadata accesses for file-backed mounts
erofs: clean up encoded map flags
erofs: error out obviously illegal extents in advance

Junrui Luo (1):
erofs: fix unsigned underflow in z_erofs_lz4_handle_overlap()

Utkal Singh (1):
erofs: harden h_shared_count in erofs_init_inode_xattrs()

Zhan Xusheng (3):
erofs: ensure all folios are managed in erofs_try_to_free_all_cached_folios()
erofs: include the trailing NUL in FS_IOC_GETFSLABEL
erofs: handle 48-bit blocks/uniaddr for extra devices

 fs/erofs/data.c              | 14 ++++++++++++++
 fs/erofs/erofs_fs.h          |  4 ++--
 fs/erofs/inode.c             |  2 +-
 fs/erofs/internal.h          | 23 +++++++++++------------
 fs/erofs/super.c             |  8 ++++++--
 fs/erofs/xattr.c             |  8 ++++++++
 fs/erofs/zdata.c             | 22 ++++++++++------------
 fs/erofs/zmap.c              | 43 +++++++++++++++++++++++++------------------
 include/trace/events/erofs.h |  7 +++----
 9 files changed, 80 insertions(+), 51 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 13 Apr 2026 12:47:49 +0800:

The pull request you sent on Mon, 13 Apr 2026 12:47:49 +0800:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-7.1-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/230fb3a33efd52613910a3970495b20295557731

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html