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

Commit 01d88857 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Jan Kara
Browse files

reiserfs: fix race in readdir 



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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 3e0d8a01

fs/reiserfs/dir.c

+4 −2
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx) 
				int d_reclen;

				char *d_name;

				ino_t d_ino;

				loff_t cur_pos = deh_offset(deh);



				if (!de_visible(deh))

					/* it is hidden entry */
@@ -196,8 +197,9 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx) 
				if (local_buf != small_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)) {

					set_cpu_key_k_offset(&pos_key,