Skip to content

Commit db0e063

Browse files
Gao Xiangintel-lab-lkp
Gao Xiang
authored andcommitted
staging: erofs: fix fast symlink w/o xattr when fs xattr is on
Currently, this will hit a BUG_ON for these symlinks as follows: - kernel message ------------[ cut here ]------------ kernel BUG at drivers/staging/erofs/xattr.c:59! SMP PTI CPU: 1 PID: 1170 Comm: getllxattr Not tainted 4.20.0-rc6+ torvalds#92 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-2.fc27 04/01/2014 RIP: 0010:init_inode_xattrs+0x22b/0x270 Code: 48 0f 45 ea f0 ff 4d 34 74 0d 41 83 4c 24 e0 01 31 c0 e9 00 fe ff ff 48 89 ef e8 e0 31 9e ff eb e9 89 e8 e9 ef fd ff ff 0f 0$ <0f> 0b 48 89 ef e8 fb f6 9c ff 48 8b 45 08 a8 01 75 24 f0 ff 4d 34 RSP: 0018:ffffa03ac026bdf8 EFLAGS: 00010246 ------------[ cut here ]------------ ... Call Trace: erofs_listxattr+0x30/0x2c0 ? selinux_inode_listxattr+0x5a/0x80 ? kmem_cache_alloc+0x33/0x170 ? security_inode_listxattr+0x27/0x40 listxattr+0xaf/0xc0 path_listxattr+0x5a/0xa0 do_syscall_64+0x43/0xf0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ... ---[ end trace 3c24b49408dc0c72 ]--- Fix it by checking ->xattr_isize in init_inode_xattrs(), and it also fixes improper return value -ENOTSUPP (it should be -ENODATA if xattr is enabled) for those inodes. Fixes: b17500a ("staging: erofs: introduce xattr & acl support") Cc: <[email protected]> # 4.19+ Reported-by: Li Guifu <[email protected]> Tested-by: Li Guifu <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Gao Xiang <[email protected]>
1 parent 153ba17 commit db0e063

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

drivers/staging/erofs/inode.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -185,16 +185,16 @@ static int fill_inode(struct inode *inode, int isdir)
185185
/* setup the new inode */
186186
if (S_ISREG(inode->i_mode)) {
187187
#ifdef CONFIG_EROFS_FS_XATTR
188-
if (vi->xattr_isize)
189-
inode->i_op = &erofs_generic_xattr_iops;
188+
inode->i_op = &erofs_generic_xattr_iops;
190189
#endif
191190
inode->i_fop = &generic_ro_fops;
192191
} else if (S_ISDIR(inode->i_mode)) {
193192
inode->i_op =
194193
#ifdef CONFIG_EROFS_FS_XATTR
195-
vi->xattr_isize ? &erofs_dir_xattr_iops :
196-
#endif
194+
&erofs_dir_xattr_iops;
195+
#else
197196
&erofs_dir_iops;
197+
#endif
198198
inode->i_fop = &erofs_dir_fops;
199199
} else if (S_ISLNK(inode->i_mode)) {
200200
/* by default, page_get_link is used for symlink */

drivers/staging/erofs/xattr.c

+20-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,26 @@ static int init_inode_xattrs(struct inode *inode)
5656
return 0;
5757

5858
vi = EROFS_V(inode);
59-
BUG_ON(!vi->xattr_isize);
59+
60+
/*
61+
* bypass all xattr operations if ->xattr_isize is not greater than
62+
* sizeof(struct erofs_xattr_ibody_header), in detail:
63+
* 1) it is not enough to contain erofs_xattr_ibody_header then
64+
* ->xattr_isize should be 0 (it means no xattr);
65+
* 2) it is just to contain erofs_xattr_ibody_header, which is on-disk
66+
* undefined right now (maybe use later with some new sb feature).
67+
*/
68+
if (vi->xattr_isize == sizeof(struct erofs_xattr_ibody_header)) {
69+
errln("xattr_isize %d of nid %llu is not supported yet",
70+
vi->xattr_isize, vi->nid);
71+
return -ENOTSUPP;
72+
} else if (vi->xattr_isize < sizeof(struct erofs_xattr_ibody_header)) {
73+
if (unlikely(vi->xattr_isize)) {
74+
DBG_BUGON(1);
75+
return -EIO; /* xattr ondisk layout error */
76+
}
77+
return -ENOATTR;
78+
}
6079

6180
sb = inode->i_sb;
6281
sbi = EROFS_SB(sb);
@@ -424,7 +443,6 @@ static int erofs_xattr_generic_get(const struct xattr_handler *handler,
424443
struct dentry *unused, struct inode *inode,
425444
const char *name, void *buffer, size_t size)
426445
{
427-
struct erofs_vnode *const vi = EROFS_V(inode);
428446
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
429447

430448
switch (handler->flags) {
@@ -442,9 +460,6 @@ static int erofs_xattr_generic_get(const struct xattr_handler *handler,
442460
return -EINVAL;
443461
}
444462

445-
if (!vi->xattr_isize)
446-
return -ENOATTR;
447-
448463
return erofs_getxattr(inode, handler->flags, name, buffer, size);
449464
}
450465

0 commit comments

Comments
 (0)