* [PATCH] v2 xfsprogs: fix inode crash in xfs_repair
@ 2013-08-16 18:12 Mark Tinguely
2013-08-19 15:33 ` Rich Johnston
2013-08-19 16:06 ` Rich Johnston
0 siblings, 2 replies; 3+ messages in thread
From: Mark Tinguely @ 2013-08-16 18:12 UTC (permalink / raw)
To: xfs
[-- Attachment #1: v2-xfs_progs-fix-repair-crash-new-ichunk.patch --]
[-- Type: text/plain, Size: 1862 bytes --]
Adding the lost+found in phase 6 could allocate an inode from
a new inode chunk. Since this chunk was not around in phase 3
when the inode chunk are verificated and added to the avl tree,
the avl tree look up will return a NULL pointer. This results
in a NULL defererence and segmentation fault.
Add the newly created inode chunk as if found in the chunk
verification phase.
Signed-off-by: Mark Tinguely <tinguely@sgi.com>
---
v2:
1) add comment.
2) simplify the if statement.
repair/incore_ino.c | 2 +-
repair/phase6.c | 16 ++++++++++++++++
2 files changed, 17 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,22 @@ 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) {
+ /*
+ * This inode is allocated from a newly created inode
+ * chunk and therefore did not exist when inode chunks
+ * were processed in phase3. Add this group of inodes to
+ * the entry avl tree as if they were discovered in phase3.
+ */
+ 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);
/*
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-19 16:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-16 18:12 [PATCH] v2 xfsprogs: fix inode crash in xfs_repair Mark Tinguely
2013-08-19 15:33 ` Rich Johnston
2013-08-19 16:06 ` Rich Johnston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox