Commit cd0e4a9d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull reiserfs fix from Jan Kara:
 "A fix for reiserfs xattr bug exposed by changes to lookup_one_len()"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: Fix warning and inode leak when deleting inode with xattrs
parents 17eb3d8f 35e5cbc0
...@@ -187,8 +187,8 @@ fill_with_dentries(void *buf, const char *name, int namelen, loff_t offset, ...@@ -187,8 +187,8 @@ fill_with_dentries(void *buf, const char *name, int namelen, loff_t offset,
if (dbuf->count == ARRAY_SIZE(dbuf->dentries)) if (dbuf->count == ARRAY_SIZE(dbuf->dentries))
return -ENOSPC; return -ENOSPC;
if (name[0] == '.' && (name[1] == '\0' || if (name[0] == '.' && (namelen < 2 ||
(name[1] == '.' && name[2] == '\0'))) (namelen == 2 && name[1] == '.')))
return 0; return 0;
dentry = lookup_one_len(name, dbuf->xadir, namelen); dentry = lookup_one_len(name, dbuf->xadir, namelen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment