Commit 921ed96b authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: actually abort log recovery on corrupt intent-done log items 



If log recovery picks up intent-done log items that are not of the
correct size it needs to abort recovery and fail the mount.  Debug
assertions are not good enough.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 3c5aaace

fs/xfs/xfs_extfree_item.c

+16 −4
Original line number Diff line number Diff line
@@ -751,12 +751,24 @@ xlog_recover_efd_commit_pass2( 
	xfs_lsn_t			lsn)

{

	struct xfs_efd_log_format	*efd_formatp;

	int				buflen = item->ri_buf[0].i_len;



	efd_formatp = item->ri_buf[0].i_addr;

	ASSERT(item->ri_buf[0].i_len == xfs_efd_log_format32_sizeof(

						efd_formatp->efd_nextents) ||

	       item->ri_buf[0].i_len == xfs_efd_log_format64_sizeof(

						efd_formatp->efd_nextents));



	if (buflen < sizeof(struct xfs_efd_log_format)) {

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, log->l_mp,

				efd_formatp, buflen);

		return -EFSCORRUPTED;

	}



	if (item->ri_buf[0].i_len != xfs_efd_log_format32_sizeof(

						efd_formatp->efd_nextents) &&

	    item->ri_buf[0].i_len != xfs_efd_log_format64_sizeof(

						efd_formatp->efd_nextents)) {

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, log->l_mp,

				efd_formatp, buflen);

		return -EFSCORRUPTED;

	}



	xlog_recover_release_intent(log, XFS_LI_EFI, efd_formatp->efd_efi_id);

	return 0;

fs/xfs/xfs_rmap_item.c

+5 −1
Original line number Diff line number Diff line
@@ -707,7 +707,11 @@ xlog_recover_rud_commit_pass2( 
	struct xfs_rud_log_format	*rud_formatp;



	rud_formatp = item->ri_buf[0].i_addr;

	ASSERT(item->ri_buf[0].i_len == sizeof(struct xfs_rud_log_format));

	if (item->ri_buf[0].i_len != sizeof(struct xfs_rud_log_format)) {

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, log->l_mp,

				rud_formatp, item->ri_buf[0].i_len);

		return -EFSCORRUPTED;

	}



	xlog_recover_release_intent(log, XFS_LI_RUI, rud_formatp->rud_rui_id);

	return 0;