diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-24 15:54:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-24 15:54:41 -0400 |
| commit | 94ef71a99a60cb03eda550410bc0b4db77ea50cf (patch) | |
| tree | 6249c18eb07484cf1adfd00955d4df212547e2da /fs | |
| parent | fe2dd212828d5c8ebe2f650f5089c705afc78ce5 (diff) | |
| parent | 17ce1eb0b64eb27d4f9180daae7495fa022c7b0d (diff) | |
| download | linux-94ef71a99a60cb03eda550410bc0b4db77ea50cf.tar.bz2 | |
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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/tnc_commit.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/xattr.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c index b45345d701e7..51157da3f76e 100644 --- a/fs/ubifs/tnc_commit.c +++ b/fs/ubifs/tnc_commit.c @@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt) p = c->gap_lebs; 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); if (written < 0) { err = written; diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index e237811f09ce..11a004114eba 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -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, 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, @@ -586,6 +587,8 @@ static int ubifs_xattr_set(const struct xattr_handler *handler, dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd", name, inode->i_ino, dentry, size); + name = xattr_full_name(handler, name); + if (value) return __ubifs_setxattr(inode, name, value, size, flags); else |