hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: inode recovery does not validate the recovered inode

Browse Source 
[ Upstream commit 038ca189c0d2c1570b4d922f25b524007c85cf94 ]

Discovered when trying to track down a weird recovery corruption
issue that wasn't detected at recovery time.

The specific corruption was a zero extent count field when big
extent counts are in use, and it turns out the dinode verifier
doesn't detect that specific corruption case, either. So fix it too.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Chinner 2025-01-29 10:47:13 -08:00 committed by Greg Kroah-Hartman
parent 6e7826272e
commit 318cac2b98
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/xfs/libxfs/xfs_inode_buf.c
View File

@ -507,6 +507,9 @@ xfs_dinode_verify(
if (mode && nextents + naextents > nblocks) if (mode && nextents + naextents > nblocks)
return __this_address; return __this_address;
if (nextents + naextents == 0 && nblocks != 0)
return __this_address;
if (S_ISDIR(mode) && nextents > mp->m_dir_geo->max_extents) if (S_ISDIR(mode) && nextents > mp->m_dir_geo->max_extents)
return __this_address; return __this_address;

14
fs/xfs/xfs_inode_item_recover.c
View File

@ -286,6 +286,7 @@ xlog_recover_inode_commit_pass2(
struct xfs_log_dinode *ldip; struct xfs_log_dinode *ldip;
uint isize; uint isize;
int need_free = 0; int need_free = 0;
xfs_failaddr_t fa;
if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) { if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) {
in_f = item->ri_buf[0].i_addr; in_f = item->ri_buf[0].i_addr;
@ -530,8 +531,19 @@ out_owner_change:
(dip->di_mode != 0)) (dip->di_mode != 0))
error = xfs_recover_inode_owner_change(mp, dip, in_f, error = xfs_recover_inode_owner_change(mp, dip, in_f,
buffer_list); buffer_list);
/* re-generate the checksum. */ /* re-generate the checksum and validate the recovered inode. */
xfs_dinode_calc_crc(log->l_mp, dip); xfs_dinode_calc_crc(log->l_mp, dip);
fa = xfs_dinode_verify(log->l_mp, in_f->ilf_ino, dip);
if (fa) {
XFS_CORRUPTION_ERROR(
"Bad dinode after recovery",
XFS_ERRLEVEL_LOW, mp, dip, sizeof(*dip));
xfs_alert(mp,
"Metadata corruption detected at %pS, inode 0x%llx",
fa, in_f->ilf_ino);
error = -EFSCORRUPTED;
goto out_release;
}
ASSERT(bp->b_mount == mp); ASSERT(bp->b_mount == mp);
bp->b_flags |= _XBF_LOGRECOVERY; bp->b_flags |= _XBF_LOGRECOVERY;