Commit 94ef71a9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs

Pull UBIFS fixes from Richard Weinberger:
 "This pull requests contains fixes for two issues in UBI and UBIFS:

   - wrong UBIFS assertion.
   - a UBIFS xattr regression"

* tag 'upstream-4.8-rc4' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix xattr generic handler usage
  ubifs: Fix assertion in layout_in_gaps()
parents fe2dd212 17ce1eb0
...@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt) ...@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt)
p = c->gap_lebs; p = c->gap_lebs;
do { do {
ubifs_assert(p < c->gap_lebs + sizeof(int) * c->lst.idx_lebs); ubifs_assert(p < c->gap_lebs + c->lst.idx_lebs);
written = layout_leb_in_gaps(c, p); written = layout_leb_in_gaps(c, p);
if (written < 0) { if (written < 0) {
err = written; err = written;
......
...@@ -575,7 +575,8 @@ static int ubifs_xattr_get(const struct xattr_handler *handler, ...@@ -575,7 +575,8 @@ static int ubifs_xattr_get(const struct xattr_handler *handler,
dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name, dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name,
inode->i_ino, dentry, size); inode->i_ino, dentry, size);
return __ubifs_getxattr(inode, name, buffer, size); name = xattr_full_name(handler, name);
return __ubifs_getxattr(inode, name, buffer, size);
} }
static int ubifs_xattr_set(const struct xattr_handler *handler, static int ubifs_xattr_set(const struct xattr_handler *handler,
...@@ -586,6 +587,8 @@ static int ubifs_xattr_set(const struct xattr_handler *handler, ...@@ -586,6 +587,8 @@ static int ubifs_xattr_set(const struct xattr_handler *handler,
dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd", dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd",
name, inode->i_ino, dentry, size); name, inode->i_ino, dentry, size);
name = xattr_full_name(handler, name);
if (value) if (value)
return __ubifs_setxattr(inode, name, value, size, flags); return __ubifs_setxattr(inode, name, value, size, flags);
else else
......
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