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

Commit 35e5cbc0 authored by Jan Kara's avatar Jan Kara
Browse files

reiserfs: Fix warning and inode leak when deleting inode with xattrs 



After commit 21d8a15a (lookup_one_len: don't accept . and ..) reiserfs
started failing to delete xattrs from inode. This was due to a buggy
test for '.' and '..' in fill_with_dentries() which resulted in passing
'.' and '..' entries to lookup_one_len() in some cases. That returned
error and so we failed to iterate over all xattrs of and inode.

Fix the test in fill_with_dentries() along the lines of the one in
lookup_one_len().

Reported-by: default avatarPawel Zawora <pzawora@gmail.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent a8c45289

fs/reiserfs/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ fill_with_dentries(void *buf, const char *name, int namelen, loff_t offset, 
	if (dbuf->count == ARRAY_SIZE(dbuf->dentries))

		return -ENOSPC;



	if (name[0] == '.' && (name[1] == '\0' ||

			       (name[1] == '.' && name[2] == '\0')))

	if (name[0] == '.' && (namelen < 2 ||

			       (namelen == 2 && name[1] == '.')))

		return 0;



	dentry = lookup_one_len(name, dbuf->xadir, namelen);