From 4b1372e12342b9cf3304227ada8f7349318316fe Mon Sep 17 00:00:00 2001
From: David Chinner <david@fromorbit.com>
Date: Thu, 30 Oct 2008 17:40:09 +1100
Subject: [PATCH] --- yaml --- r: 118757 b: refs/heads/master c:
 220ca310a53200b4bfbc7c4c6e365eea284ec44f h: refs/heads/master i:   118755:
 d15ec6a34c97b13b2a7a860f7e541e147bfd38cf v: v3

---
 [refs]                         | 2 +-
 trunk/fs/xfs/xfs_log_recover.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af9450dde9ff..6afaa80a8e2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f330f5149ef41ff943b04d914406cc417f62784
+refs/heads/master: 220ca310a53200b4bfbc7c4c6e365eea284ec44f
diff --git a/trunk/fs/xfs/xfs_log_recover.c b/trunk/fs/xfs/xfs_log_recover.c
index 82d46ce69d5f..70e3ba32e6be 100644
--- a/trunk/fs/xfs/xfs_log_recover.c
+++ b/trunk/fs/xfs/xfs_log_recover.c
@@ -1419,7 +1419,13 @@ xlog_recover_add_to_trans(
 		return 0;
 	item = trans->r_itemq;
 	if (item == NULL) {
-		ASSERT(*(uint *)dp == XFS_TRANS_HEADER_MAGIC);
+		/* we need to catch log corruptions here */
+		if (*(uint *)dp != XFS_TRANS_HEADER_MAGIC) {
+			xlog_warn("XFS: xlog_recover_add_to_trans: "
+				  "bad header magic number");
+			ASSERT(0);
+			return XFS_ERROR(EIO);
+		}
 		if (len == sizeof(xfs_trans_header_t))
 			xlog_recover_add_item(&trans->r_itemq);
 		memcpy(&trans->r_theader, dp, len); /* d, s, l */