reiserfs: Fix warning and inode leak when deleting inode with xattrs
Jan Kara
reviewerPATCH 1/1 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().
--- fs/reiserfs/xattr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/reiserfs/xattr.c +2 -2
@@ -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);
Signature · 1 line
1.7.1
Looks good to me
Quoted 38 lines · Jan Kara
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 '..' infill_with_dentries()which resulted in passing '.' and '..' entries tolookup_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 inlookup_one_len().Reported-by Pawel Zawora <[email protected]>Signed-off-by Jan Kara <[email protected]>--- fs/reiserfs/xattr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/reiserfs/xattr.c +2
-2@@ -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);Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 1 line
Carlos