ocfs2: validate external xattr value roots before reuse
PATCH 1/1 ocfs2: validate external xattr value roots before reuse
[BUG]
A corrupted image can make setxattr() trip over:
kernel BUG at fs/ocfs2/xattr.c:743!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ocfs2_xattr_extend_allocation+0x5d1/0x850 fs/ocfs2/xattr.c:743 Call Trace: ocfs2_xattr_value_truncate+0x50f/0x700 fs/ocfs2/xattr.c:864 ocfs2_xa_value_truncate+0xd4/0x1f0 fs/ocfs2/xattr.c:1915 ocfs2_xa_reuse_entry fs/ocfs2/xattr.c:2097 [inline] ocfs2_xa_prepare_entry fs/ocfs2/xattr.c:2141 [inline] ocfs2_xa_set+0x21d8/0x30a0 fs/ocfs2/xattr.c:2251 ocfs2_xattr_block_set+0x296/0x770 fs/ocfs2/xattr.c:2985 __ocfs2_xattr_set_handle+0x301/0xdb0 fs/ocfs2/xattr.c:3387 ocfs2_xattr_set+0x1447/0x2610 fs/ocfs2/xattr.c:3650 ocfs2_xattr_trusted_set+0x37/0x50 fs/ocfs2/xattr.c:7336 __vfs_setxattr+0x14f/0x1c0 fs/xattr.c:200 __vfs_setxattr_noperm+0x10b/0x5c0 fs/xattr.c:234 __vfs_setxattr_locked+0x172/0x240 fs/xattr.c:295 vfs_setxattr+0x167/0x390 fs/xattr.c:321 do_setxattr+0x13c/0x180 fs/xattr.c:636 filename_setxattr+0x16b/0x1c0 fs/xattr.c:665 path_setxattrat+0x1d8/0x280 fs/xattr.c:713 __do_sys_setxattr fs/xattr.c:747 [inline] __se_sys_setxattr fs/xattr.c:743 [inline] ...
[CAUSE]
Exact-match xattr lookup validates only the entry pointer and name bytes. It does not validate the embedded ocfs2_xattr_value_root that sits behind a non-local xattr entry.
ocfs2_xa_reuse_entry() therefore accepts a corrupt on-disk value root, feeds its xr_clusters/xr_list into ocfs2_xattr_value_truncate(), and can reach ocfs2_add_clusters_in_btree() with a tree state that violates the allocator's assumptions. When that happens, ocfs2_xattr_extend_allocation() sees RESTART_META in a path that assumes only RESTART_TRANS is possible and fires BUG_ON().
[FIX]
Add a validator for external xattr value roots and run it at the exact-match lookup boundary, before the found entry is handed to xs->here.
The new check rejects corrupt non-local xattr entries whose embedded value root does not fit in the storage region or whose fixed root extent-list invariants are broken. This stops the bad metadata before setxattr() can reuse it and reach the BUG_ON().
---
No Fixes tag is added because this is a defensive read-side validation for long-standing metadata assumptions rather than a single-commit regression.
---
fs/ocfs2/xattr.c +91 -2
@@ -237,6 +237,81 @@ static int namevalue_size_xe(struct ocfs2_xattr_entry *xe)return namevalue_size (xe->xe_name_len, value_len); } +static int ocfs2_validate_xv_root (struct inode *inode, +struct ocfs2_xattr_entry *xe, +void *base, +void *end) +{ +char *nameval = base +le16_to_cpu (xe->xe_name_offset); +struct ocfs2_xattr_value_root *xv; +struct ocfs2_extent_list *el; +struct ocfs2_extent_rec *rec; +u16 tree_depth, count, next_free; +u32 clusters, expected_clusters, rec_clusters; +u64 last_eb_blk; + +if (nameval +OCFS2_XATTR_SIZE (xe->xe_name_len) + +OCFS2_XATTR_ROOT_SIZE > (char *)end) +return ocfs2_error (inode->i_sb, +"Inode %llu has corrupt xattr value root bounds\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno); + + xv = (struct ocfs2_xattr_value_root *)(nameval + +OCFS2_XATTR_SIZE (xe->xe_name_len)); + el = &xv->xr_list; + tree_depth =le16_to_cpu (el->l_tree_depth); + count =le16_to_cpu (el->l_count); + next_free =le16_to_cpu (el->l_next_free_rec); + clusters =le32_to_cpu (xv->xr_clusters); + expected_clusters =ocfs2_clusters_for_bytes (inode->i_sb, +le64_to_cpu (xe->xe_value_size)); + last_eb_blk =le64_to_cpu (xv->xr_last_eb_blk); + +if (count !=1 ) +return ocfs2_error (inode->i_sb, +"Inode %llu has invalid xattr value root count %u\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, + count); + +if (next_free !=1 ) +return ocfs2_error (inode->i_sb, +"Inode %llu has invalid xattr value root index %u\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, + next_free); + +if (tree_depth >=OCFS2_MAX_PATH_DEPTH ) +return ocfs2_error (inode->i_sb, +"Inode %llu has invalid xattr value root depth %u\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, + tree_depth); + +if (!!last_eb_blk != !!tree_depth) +return ocfs2_error (inode->i_sb, +"Inode %llu has inconsistent xattr value root last_eb %llu at depth %u\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, + (unsigned long long )last_eb_blk, + tree_depth); + +if (!clusters || clusters != expected_clusters) +return ocfs2_error (inode->i_sb, +"Inode %llu has invalid xattr value root clusters %u (expected %u)\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, + clusters, expected_clusters); + + rec = &el->l_recs[0 ]; + rec_clusters =ocfs2_rec_clusters (el, rec); +if (!le64_to_cpu (rec->e_blkno) ||le32_to_cpu (rec->e_cpos) || + !rec_clusters || rec_clusters != clusters) +return ocfs2_error (inode->i_sb, +"Inode %llu has corrupt xattr value root record (%u, %u, %llu) for %u clusters\n" , + (unsigned long long )OCFS2_I (inode)->ip_blkno, +le32_to_cpu (rec->e_cpos), rec_clusters, + (unsigned long long )le64_to_cpu (rec->e_blkno), + clusters); + +return 0 ; +} + static int ocfs2_xattr_bucket_get_name_value(struct super_block *sb, struct ocfs2_xattr_header *xh,
@@ -1098,7 +1173,7 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, {struct ocfs2_xattr_entry *entry;size_t name_len; -int i, name_offset, cmp =1 ; +int i, name_offset, cmp =1 , ret;if (name ==NULL )return -EINVAL ;
@@ -1121,6 +1196,11 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index,return -EFSCORRUPTED ; } cmp =memcmp (name, (xs->base + name_offset), name_len); +if (!cmp && !ocfs2_xattr_is_local (entry)) { + ret =ocfs2_validate_xv_root (inode, entry, xs->base, xs->end); +if (ret) +return ret; + } }if (cmp ==0 )break ;
@@ -3790,6 +3870,8 @@ static int ocfs2_find_xe_in_bucket(struct inode *inode,struct ocfs2_xattr_header *xh =bucket_xh (bucket);size_t name_len =strlen (name);struct ocfs2_xattr_entry *xe =NULL ; +char *block; +char *block_end;char *xe_name;/*
@@ -3821,8 +3903,15 @@ static int ocfs2_find_xe_in_bucket(struct inode *inode, } - xe_name =bucket_block (bucket, block_off) + new_offset; + block =bucket_block (bucket, block_off); + block_end = block + inode->i_sb->s_blocksize; + xe_name = block + new_offset;if (!memcmp (name, xe_name, name_len)) { +if (!ocfs2_xattr_is_local (xe)) { + ret =ocfs2_validate_xv_root (inode, xe, block, block_end); +if (ret) +break ; + } *xe_index = i; *found =1 ; ret =0 ;
Signature · 1 line
2.43.0