2006-12-07 23:02:40

by Andrew Morton

[permalink] [raw]
Subject: - handle-ext4-directory-corruption-better.patch removed from -mm tree

The patch titled
handle ext4 directory corruption better
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

Subject: handle ext4 directory corruption better
From: Eric Sandeen <[email protected]>

I've been using Steve Grubb's purely evil "fsfuzzer" tool, at

Basically it makes a filesystem, splats some random bits over it, then
tries to mount it and do some simple filesystem actions.

At best, the filesystem catches the corruption gracefully. At worst,
things spin out of control.

As you might guess, we found a couple places in ext4 where things spin out
of control :)

First, we had a corrupted directory that was never checked for
consistency... it was corrupt, and pointed to another bad "entry" of
length 0. The for() loop looped forever, since the length of
ext4_next_entry(de) was 0, and we kept looking at the same pointer over and
over and over and over... I modeled this check and subsequent action on
what is done for other directory types in ext4_readdir...

(adding this check adds some computational expense; I am testing a followup
patch to reduce the number of times we check and re-check these directory
entries, in all cases. Thanks for the idea, Andreas).

Next we had a root directory inode which had a corrupted size, claimed to
be > 200M on a 4M filesystem. There was only really 1 block in the
directory, but because the size was so large, readdir kept coming back for
more, spewing thousands of printk's along the way.

Per Andreas' suggestion, if we're in this read error condition and we're
trying to read an offset which is greater than i_blocks worth of bytes,
stop trying, and break out of the loop.

With these two changes fsfuzz test survives quite well on ext4.

Signed-off-by: Eric Sandeen <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/ext4/dir.c | 3 +++
fs/ext4/namei.c | 9 +++++++++
2 files changed, 12 insertions(+)

diff -puN fs/ext4/dir.c~handle-ext4-directory-corruption-better fs/ext4/dir.c
--- a/fs/ext4/dir.c~handle-ext4-directory-corruption-better
+++ a/fs/ext4/dir.c
@@ -153,6 +153,9 @@ static int ext4_readdir(struct file * fi
ext4_error (sb, "ext4_readdir",
"directory #%lu contains a hole at offset %lu",
inode->i_ino, (unsigned long)filp->f_pos);
+ /* corrupt size? Maybe no more blocks to read */
+ if (filp->f_pos > inode->i_blocks << 9)
+ break;
filp->f_pos += sb->s_blocksize - offset;
diff -puN fs/ext4/namei.c~handle-ext4-directory-corruption-better fs/ext4/namei.c
--- a/fs/ext4/namei.c~handle-ext4-directory-corruption-better
+++ a/fs/ext4/namei.c
@@ -552,6 +552,15 @@ static int htree_dirblock_to_tree(struct
dir->i_sb->s_blocksize -
for (; de < top; de = ext4_next_entry(de)) {
+ if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
+ (block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))
+ +((char *)de - bh->b_data))) {
+ /* On error, skip the f_pos to the next block. */
+ dir_file->f_pos = (dir_file->f_pos |
+ (dir->i_sb->s_blocksize - 1)) + 1;
+ brelse (bh);
+ return count;
+ }
ext4fs_dirhash(de->name, de->name_len, hinfo);
if ((hinfo->hash < start_hash) ||
((hinfo->hash == start_hash) &&

Patches currently in -mm which might be from [email protected] are