diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2013-07-01 08:12:38 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-07-27 05:34:25 +0100 |
| commit | 78d07e4aa54372ad2240273e0969ebf7f44fc3c0 (patch) | |
| tree | 74cc7cbbb9e3238b67489073a63f4f41a8e39848 /fs/ext4 | |
| parent | 1aa33199c5969b6a062727438ba0795864dd3fbe (diff) | |
| download | kernel_samsung_smdk4412-78d07e4aa54372ad2240273e0969ebf7f44fc3c0.zip kernel_samsung_smdk4412-78d07e4aa54372ad2240273e0969ebf7f44fc3c0.tar.gz kernel_samsung_smdk4412-78d07e4aa54372ad2240273e0969ebf7f44fc3c0.tar.bz2 | |
ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()
commit 64cb927371cd2ec43758d8a094a003d27bc3d0dc upstream.
Both ext3 and ext4 htree_dirblock_to_tree() is just filling the
in-core rbtree for use by call_filldir(). All updates of ->f_pos are
done by the latter; bumping it here (on error) is obviously wrong - we
might very well have it nowhere near the block we'd found an error in.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/namei.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 88f97e5..3ca3b7f 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -585,11 +585,8 @@ static int htree_dirblock_to_tree(struct file *dir_file, if (ext4_check_dir_entry(dir, NULL, 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; + /* silently ignore the rest of the block */ + break; } ext4fs_dirhash(de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) || |