diff options
| author | Jan Kara <jack@suse.cz> | 2013-03-29 15:39:16 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-03-29 17:08:43 +0100 |
| commit | 35e5cbc0af240778e61113286c019837e06aeec6 (patch) | |
| tree | d08cf007a00266ea8aef23e01ed832c9053d844a /fs/reiserfs | |
| parent | a8c45289f215e137825bf9630d0abb41c1dc41ff (diff) | |
| download | blackbird-op-linux-35e5cbc0af240778e61113286c019837e06aeec6.tar.gz blackbird-op-linux-35e5cbc0af240778e61113286c019837e06aeec6.zip | |
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: Pawel Zawora <pzawora@gmail.com>
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index c196369fe408..4cce1d9552fb 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -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); |
