xfs
[Top] [All Lists]

[PATCH] xfsprogs: fix inode crash in xfs_repair

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfsprogs: fix inode crash in xfs_repair
From: Mark Tinguely <tinguely@xxxxxxx>
Date: Tue, 13 Aug 2013 17:13:31 -0500
Delivered-to: xfs@xxxxxxxxxxx
User-agent: quilt/0.51-1
Adding the lost+found in phase 6 could allocate an inode from
a new inode chunk. That newly created chunk was not around in
the scan phase, and is not in the avl tree which will result
in a NULL dereference.

This patch adds the newly created inode chunk and inodes as if
found in the scan phase.

Metadata dump available for future tests.

Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
---
 repair/incore_ino.c |    2 +-
 repair/phase6.c     |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Index: b/repair/incore_ino.c
===================================================================
--- a/repair/incore_ino.c
+++ b/repair/incore_ino.c
@@ -700,7 +700,7 @@ get_inode_parent(ino_tree_node_t *irec,
        return(0LL);
 }
 
-static void
+void
 alloc_ex_data(ino_tree_node_t *irec)
 {
        parent_list_t   *ptbl;
Index: b/repair/phase6.c
===================================================================
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -930,6 +930,21 @@ mk_orphanage(xfs_mount_t *mp)
        irec = find_inode_rec(mp,
                        XFS_INO_TO_AGNO(mp, ino),
                        XFS_INO_TO_AGINO(mp, ino));
+
+       if (irec == NULL && XFS_INO_TO_AGNO(mp, ino) < mp->m_sb.sb_agcount &&
+           ip != NULL && ip->i_d.di_magic == XFS_DINODE_MAGIC) {
+
+               /*
+                * add the newly allocated inode chunk to the avl tree.
+                */
+               irec = set_inode_free_alloc(mp, XFS_INO_TO_AGNO(mp, ino),
+                                           XFS_INO_TO_AGINO(mp, ino));
+               alloc_ex_data(irec);
+
+               for (i = 0; i < XFS_INODES_PER_CHUNK; i++)
+                       set_inode_free(irec, i);
+       }
+
        ino_offset = get_inode_offset(mp, ino, irec);
 
        /*


<Prev in Thread] Current Thread [Next in Thread>