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

Commit ae76dd9a authored by Duane Griffin's avatar Duane Griffin Committed by Linus Torvalds
Browse files

ext3: handle corrupted orphan list at mount 

If the orphan node list includes valid, untruncatable nodes with nlink > 0
the ext3_orphan_cleanup loop which attempts to delete them will not do so,
causing it to loop forever. Fix by checking for such nodes in the
ext3_orphan_get function.

This patch fixes the second case (image hdb.20000009.softlockup.gz)
reported in http://bugzilla.kernel.org/show_bug.cgi?id=10882

.

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: printk warning fix]
Signed-off-by: default avatarDuane Griffin <duaneg@dghda.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef1afd39

fs/ext3/ialloc.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -669,6 +669,14 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 
	if (IS_ERR(inode))

	if (IS_ERR(inode))

		goto iget_failed;

		goto iget_failed;





	/*

	 * If the orphans has i_nlinks > 0 then it should be able to be

	 * truncated, otherwise it won't be removed from the orphan list

	 * during processing and an infinite loop will result.

	 */

	if (inode->i_nlink && !ext3_can_truncate(inode))

		goto bad_orphan;



	if (NEXT_ORPHAN(inode) > max_ino)

	if (NEXT_ORPHAN(inode) > max_ino)

		goto bad_orphan;

		goto bad_orphan;

	brelse(bitmap_bh);

	brelse(bitmap_bh);
@@ -690,6 +698,7 @@ bad_orphan: 
		printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%u\n",

		printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%u\n",

		       NEXT_ORPHAN(inode));

		       NEXT_ORPHAN(inode));

		printk(KERN_NOTICE "max_ino=%lu\n", max_ino);

		printk(KERN_NOTICE "max_ino=%lu\n", max_ino);

		printk(KERN_NOTICE "i_nlink=%u\n", inode->i_nlink);

		/* Avoid freeing blocks if we got a bad deleted inode */

		/* Avoid freeing blocks if we got a bad deleted inode */

		if (inode->i_nlink == 0)

		if (inode->i_nlink == 0)

			inode->i_blocks = 0;

			inode->i_blocks = 0;

fs/ext3/inode.c

+14 −6
Original line number Original line Diff line number Diff line
@@ -2253,6 +2253,19 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode, 
	}

	}

}

}





int ext3_can_truncate(struct inode *inode)

{

	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))

		return 0;

	if (S_ISREG(inode->i_mode))

		return 1;

	if (S_ISDIR(inode->i_mode))

		return 1;

	if (S_ISLNK(inode->i_mode))

		return !ext3_inode_is_fast_symlink(inode);

	return 0;

}



/*

/*

 * ext3_truncate()

 * ext3_truncate()

 *

 *
@@ -2297,12 +2310,7 @@ void ext3_truncate(struct inode *inode) 
	unsigned blocksize = inode->i_sb->s_blocksize;

	unsigned blocksize = inode->i_sb->s_blocksize;

	struct page *page;

	struct page *page;





	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||

	if (!ext3_can_truncate(inode))

	    S_ISLNK(inode->i_mode)))

		return;

	if (ext3_inode_is_fast_symlink(inode))

		return;

	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))

		return;

		return;





	/*

	/*

include/linux/ext3_fs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -832,6 +832,7 @@ extern void ext3_discard_reservation (struct inode *); 
extern void ext3_dirty_inode(struct inode *);

extern void ext3_dirty_inode(struct inode *);

extern int ext3_change_inode_journal_flag(struct inode *, int);

extern int ext3_change_inode_journal_flag(struct inode *, int);

extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *);

extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *);

extern int ext3_can_truncate(struct inode *inode);

extern void ext3_truncate (struct inode *);

extern void ext3_truncate (struct inode *);

extern void ext3_set_inode_flags(struct inode *);

extern void ext3_set_inode_flags(struct inode *);

extern void ext3_get_inode_flags(struct ext3_inode_info *);

extern void ext3_get_inode_flags(struct ext3_inode_info *);