leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reiserfs: fix race in readdir

Browse Source 
jdm-20004 reiserfs_delete_xattrs: Couldn't delete all xattrs (-2)

The -ENOENT is due to readdir calling dir_emit on the same entry twice.

If the dir_emit callback sleeps and the tree is changed underneath us,
we won't be able to trust deh_offset(deh) anymore. We need to save
next_pos before we might sleep so we can find the next entry.

CC: stable@vger.kernel.org
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jeff Mahoney 2014-04-02 14:40:26 -04:00 committed by Jan Kara
parent 3e0d8a0104
commit 01d8885785
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/reiserfs/dir.c
View File

@ -125,6 +125,7 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx)
int d_reclen; int d_reclen;
char *d_name; char *d_name;
ino_t d_ino; ino_t d_ino;
loff_t cur_pos = deh_offset(deh);
if (!de_visible(deh)) if (!de_visible(deh))
/* it is hidden entry */ /* it is hidden entry */
@ -196,8 +197,9 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx)
if (local_buf != small_buf) { if (local_buf != small_buf) {
kfree(local_buf); kfree(local_buf);
} }
// next entry should be looked for with such offset
next_pos = deh_offset(deh) + 1; /* deh_offset(deh) may be invalid now. */
next_pos = cur_pos + 1;
if (item_moved(&tmp_ih, &path_to_entry)) { if (item_moved(&tmp_ih, &path_to_entry)) {
set_cpu_key_k_offset(&pos_key, set_cpu_key_k_offset(&pos_key,