Skip to content

Commit 79b09c5

Browse files
Jia Zhuhsiangkao
authored andcommitted
erofs: fix metabuf leak in inode xattr initialization
commit bb88e8d ("erofs: use meta buffers for xattr operations") converted xattr operations to use on-stack erofs_buf instances. erofs_init_inode_xattrs() uses such a metabuf while reading the inline xattr header and shared xattr id array. Some error paths after erofs_read_metabuf() leave through out_unlock without dropping the metabuf, so the folio reference can leak. Consolidate the cleanup at out_unlock. erofs_put_metabuf() is a no-op if no folio has been acquired, and this keeps all paths after taking EROFS_I_BL_XATTR_BIT covered by a single cleanup site. Fixes: bb88e8d ("erofs: use meta buffers for xattr operations") Signed-off-by: Jia Zhu <zhujia.zj@bytedance.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Fixes: bb88e8d ("erofs: use meta buffers for xattr operations") Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
1 parent 649932f commit 79b09c5

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

fs/erofs/xattr.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,11 @@ static int erofs_init_inode_xattrs(struct inode *inode)
8989
vi->xattr_isize - sizeof(struct erofs_xattr_ibody_header)) {
9090
erofs_err(sb, "invalid h_shared_count %u @ nid %llu",
9191
vi->xattr_shared_count, vi->nid);
92-
erofs_put_metabuf(&buf);
9392
ret = -EFSCORRUPTED;
9493
goto out_unlock;
9594
}
9695
vi->xattr_shared_xattrs = kmalloc_objs(uint, vi->xattr_shared_count);
9796
if (!vi->xattr_shared_xattrs) {
98-
erofs_put_metabuf(&buf);
9997
ret = -ENOMEM;
10098
goto out_unlock;
10199
}
@@ -112,12 +110,12 @@ static int erofs_init_inode_xattrs(struct inode *inode)
112110
}
113111
vi->xattr_shared_xattrs[i] = le32_to_cpu(*xattr_id);
114112
}
115-
erofs_put_metabuf(&buf);
116113

117114
/* paired with smp_mb() at the beginning of the function. */
118115
smp_mb();
119116
set_bit(EROFS_I_EA_INITED_BIT, &vi->flags);
120117
out_unlock:
118+
erofs_put_metabuf(&buf);
121119
clear_and_wake_up_bit(EROFS_I_BL_XATTR_BIT, &vi->flags);
122120
return ret;
123121
}

0 commit comments

Comments
 (0)