Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9742bb93 authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Lachlan McIlroy
Browse files

[XFS] prevent panic during log recovery due to bogus op_hdr length 



A problem was reported where a system panicked in log recovery due to a
corrupt log record. The cause of the corruption is not known but this
change will at least prevent a crash for this specific scenario. Log
recovery definitely needs some more work in this area.

SGI-PV: 974151
SGI-Modid: xfs-linux-melb:xfs-kern:30318a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
parent f71354bc

fs/xfs/xfs_log_recover.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -2912,7 +2912,12 @@ xlog_recover_process_data( 
				xlog_recover_new_tid(&rhash[hash], tid,

				xlog_recover_new_tid(&rhash[hash], tid,

					be64_to_cpu(rhead->h_lsn));

					be64_to_cpu(rhead->h_lsn));

		} else {

		} else {

			ASSERT(dp + be32_to_cpu(ohead->oh_len) <= lp);

			if (dp + be32_to_cpu(ohead->oh_len) > lp) {

				xlog_warn(

			"XFS: xlog_recover_process_data: bad length");

				WARN_ON(1);

				return (XFS_ERROR(EIO));

			}

			flags = ohead->oh_flags & ~XLOG_END_TRANS;

			flags = ohead->oh_flags & ~XLOG_END_TRANS;

			if (flags & XLOG_WAS_CONT_TRANS)

			if (flags & XLOG_WAS_CONT_TRANS)

				flags &= ~XLOG_CONTINUE_TRANS;

				flags &= ~XLOG_CONTINUE_TRANS;