diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2013-07-01 08:12:38 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-07-01 08:12:38 -0400 |
| commit | 64cb927371cd2ec43758d8a094a003d27bc3d0dc (patch) | |
| tree | bbb032968f94b2bdf75f17228e1b494693d5a9af /fs/ext3 | |
| parent | fe52d17cdd343ac43c85cf72940a58865b9d3bfb (diff) | |
| download | linux-64cb927371cd2ec43758d8a094a003d27bc3d0dc.tar.gz linux-64cb927371cd2ec43758d8a094a003d27bc3d0dc.tar.bz2 linux-64cb927371cd2ec43758d8a094a003d27bc3d0dc.zip | |
ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/namei.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 692de13e3596..cea8ecf3e76e 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -576,11 +576,8 @@ static int htree_dirblock_to_tree(struct file *dir_file, if (!ext3_check_dir_entry("htree_dirblock_to_tree", dir, de, bh, (block<<EXT3_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; } ext3fs_dirhash(de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) || |