android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erofs: fix potential overflow calculating xattr_isize

Browse Source 
[ Upstream commit 1b3567a1969b26f709d82a874498c0754ea841c3 ]

Given on-disk i_xattr_icount is 16 bits and xattr_isize is calculated
from i_xattr_icount multiplying 4, xattr_isize has a theoretical maximum
of 256K (64K * 4).

Thus declare xattr_isize as unsigned int to avoid the potential overflow.

Fixes: bfb8674dc0 ("staging: erofs: add erofs in-memory stuffs")
Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230414061810.6479-1-jefflexu@linux.alibaba.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jingbo Xu 2023-04-14 14:18:10 +08:00 committed by Greg Kroah-Hartman
parent 50f1c1fba0
commit 0955b8eac3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/erofs/internal.h
View File

@ -311,7 +311,7 @@ struct erofs_inode {
unsigned char datalayout; unsigned char datalayout;
unsigned char inode_isize; unsigned char inode_isize;
unsigned short xattr_isize; unsigned int xattr_isize;
unsigned int xattr_shared_count; unsigned int xattr_shared_count;
unsigned int *xattr_shared_xattrs; unsigned int *xattr_shared_xattrs;