openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-26 19:51:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix xattr max value len bug

Browse Source 
Signed-off-by: nieben <nieben1@huawei.com>

Change-Id: I69291a8bf2304fc3af3d6f2678f17f67f6255306
This commit is contained in:
nieben 2024-09-27 15:05:55 +08:00
parent a30faae1c6
commit 7067537b04
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsck/fsck.c
View File

@ -832,7 +832,7 @@ check_next:
le16_to_cpu(node_blk->i.i_inline_xattr_size); le16_to_cpu(node_blk->i.i_inline_xattr_size);
if (!inline_size || if (!inline_size ||
inline_size > MAX_INLINE_XATTR_SIZE) { inline_size > MAX_INLINE_XATTR_SIZE(&node_blk->i)) {
ASSERT_MSG("[0x%x] wrong inline_xattr_size:%u", ASSERT_MSG("[0x%x] wrong inline_xattr_size:%u",
nid, inline_size); nid, inline_size);
if (c.fix_on) { if (c.fix_on) {

8
fsck/xattr.c
View File

@ -151,7 +151,7 @@ int f2fs_setxattr(struct f2fs_sb_info *sbi, nid_t ino, int index, const char *na
len = strlen(name); len = strlen(name);
if (len > F2FS_NAME_LEN || size > MAX_VALUE_LEN) if (len > F2FS_NAME_LEN)
return -ERANGE; return -ERANGE;
if (ino < 3) if (ino < 3)
@ -166,6 +166,12 @@ int f2fs_setxattr(struct f2fs_sb_info *sbi, nid_t ino, int index, const char *na
ret = dev_read_block(inode, ni.blk_addr); ret = dev_read_block(inode, ni.blk_addr);
ASSERT(ret >= 0); ASSERT(ret >= 0);
if (size > MAX_VALUE_LEN(&inode->i)) {
MSG(0, "Size %d exceeds max value len %d.\n", size, MAX_VALUE_LEN(&inode->i));
free(inode);
return -ERANGE;
}
base_addr = read_all_xattrs(sbi, inode); base_addr = read_all_xattrs(sbi, inode);
ASSERT(base_addr); ASSERT(base_addr);

13
fsck/xattr.h
View File

@ -135,13 +135,14 @@ static inline int f2fs_acl_count(int size)
#define MIN_OFFSET XATTR_ALIGN(F2FS_BLKSIZE - \ #define MIN_OFFSET XATTR_ALIGN(F2FS_BLKSIZE - \
sizeof(struct node_footer) - sizeof(__u32)) sizeof(struct node_footer) - sizeof(__u32))
#define MAX_VALUE_LEN (MIN_OFFSET - \ #define MAX_XATTR_BLOCK_SIZE (F2FS_BLKSIZE - sizeof(struct node_footer))
#define MAX_XATTR_SIZE(inode) (XATTR_ALIGN((MAX_INLINE_XATTR_SIZE(inode)) + \
(MAX_XATTR_BLOCK_SIZE)))
#define MAX_VALUE_LEN(inode) (MAX_XATTR_SIZE(inode) - \
sizeof(struct f2fs_xattr_header) - \ sizeof(struct f2fs_xattr_header) - \
sizeof(struct f2fs_xattr_entry)) sizeof(struct f2fs_xattr_entry))
#define MAX_INLINE_XATTR_SIZE \ #define MAX_INLINE_XATTR_SIZE(inode) (inline_xattr_size(inode))
(DEF_ADDRS_PER_INODE - \
F2FS_TOTAL_EXTRA_ATTR_SIZE / sizeof(__le32) - \
DEF_INLINE_RESERVED_SIZE - \
MIN_INLINE_DENTRY_SIZE / sizeof(__le32))
#endif #endif