mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
This pull requests contains fixes for two issues in UBI and UBIFS:
1. Wrong UBIFS assertion. 2. A UBIFS xattr regression. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABAgAGBQJXvflzAAoJEEtJtSqsAOnWs8QP/jEgGY5QcuvdIA+ymFFFeZ8o /8YwzbLula+M5T7trMSaRmT5AW5iwY/Xu/VVpVipKMVkAP7079jLjJljOckwriut FY60BoQ8VcxwFPRn5xMDJ6KdDMAzVFX10j/+h71VrlE6Ej4nu8XVYGYiRdnjTYiF JdxvuWgIDmycRT6bH69c5ZSNpMuOPpCydX0CbWEFk9P07BKL2+9inpPBGRJxy8y8 abT4ByCJmZWjruzjeBrR4o9A2hrDTrlHPH2RzQgJXCDKntM8AjsCCCReHbhrCKLo QmZh+8l8N8HN4GQczcrbTSL0EZn3IsbAS6Ut03NOPcSb+kWjaH5Hcr2kEUEFA7R4 myKfFe6/BorgHX4QTqNiX7r0y63YepcIFAIUnfzv4wya8p+IGAunouZ+D6e+3BPy ICUv3oGqDZkI/fqc5h3cU9RLF7fOvdAtqO+M/lInwFPbqv3jJoVxuC4oD7PEh/eY n7VNeVyYr+8JZ5MKBU3zYHRNyHDYME+wTpNGu/4fJR1Rsym523L7hka3zQDkDqs3 xqFoln1BcRKT/kMTKubK5dLAWaRv68RuMZTPRDeSBrY5vY7jYTYg/42eXnmcOzeP vi8L3p8o2CSLHTjeX+Q0lHAw/Ppy/FFowUEx03huj0C+5LNtY6RvIvBtC3YABR8U nC92PnhRhl9gUvkDuii9 =8pdh -----END PGP SIGNATURE----- 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()
This commit is contained in:
commit
94ef71a99a
2 changed files with 5 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue