Unverified Commit 54069f6b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10748 v2 CVE-2024-41016 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YKGAFU3RX5NRAT34W23IOUMNDIHVLEEO/ 
Ferry Meng (2):
  ocfs2: add bounds checking to ocfs2_xattr_find_entry()
  ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry()


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAG8SI 
 
Link:https://gitee.com/openeuler/kernel/pulls/10748

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 0512e86d c79d0fbb

fs/ocfs2/xattr.c

+18 −9
Original line number Diff line number Diff line
@@ -1068,13 +1068,13 @@ ssize_t ocfs2_listxattr(struct dentry *dentry, 
	return i_ret + b_ret;

}



static int ocfs2_xattr_find_entry(int name_index,

static int ocfs2_xattr_find_entry(struct inode *inode, int name_index,

				  const char *name,

				  struct ocfs2_xattr_search *xs)

{

	struct ocfs2_xattr_entry *entry;

	size_t name_len;

	int i, cmp = 1;

	int i, name_offset, cmp = 1;



	if (name == NULL)

		return -EINVAL;
@@ -1082,13 +1082,22 @@ static int ocfs2_xattr_find_entry(int name_index, 
	name_len = strlen(name);

	entry = xs->here;

	for (i = 0; i < le16_to_cpu(xs->header->xh_count); i++) {

		if ((void *)entry >= xs->end) {

			ocfs2_error(inode->i_sb, "corrupted xattr entries");

			return -EFSCORRUPTED;

		}

		cmp = name_index - ocfs2_xattr_get_type(entry);

		if (!cmp)

			cmp = name_len - entry->xe_name_len;

		if (!cmp)

			cmp = memcmp(name, (xs->base +

				     le16_to_cpu(entry->xe_name_offset)),

				     name_len);

		if (!cmp) {

			name_offset = le16_to_cpu(entry->xe_name_offset);

			if ((xs->base + name_offset + name_len) > xs->end) {

				ocfs2_error(inode->i_sb,

					    "corrupted xattr entries");

				return -EFSCORRUPTED;

			}

			cmp = memcmp(name, (xs->base + name_offset), name_len);

		}

		if (cmp == 0)

			break;

		entry += 1;
@@ -1172,7 +1181,7 @@ static int ocfs2_xattr_ibody_get(struct inode *inode, 
	xs->base = (void *)xs->header;

	xs->here = xs->header->xh_entries;



	ret = ocfs2_xattr_find_entry(name_index, name, xs);

	ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);

	if (ret)

		return ret;

	size = le64_to_cpu(xs->here->xe_value_size);
@@ -2704,7 +2713,7 @@ static int ocfs2_xattr_ibody_find(struct inode *inode, 


	/* Find the named attribute. */

	if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) {

		ret = ocfs2_xattr_find_entry(name_index, name, xs);

		ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);

		if (ret && ret != -ENODATA)

			return ret;

		xs->not_found = ret;
@@ -2839,7 +2848,7 @@ static int ocfs2_xattr_block_find(struct inode *inode, 
		xs->end = (void *)(blk_bh->b_data) + blk_bh->b_size;

		xs->here = xs->header->xh_entries;



		ret = ocfs2_xattr_find_entry(name_index, name, xs);

		ret = ocfs2_xattr_find_entry(inode, name_index, name, xs);

	} else

		ret = ocfs2_xattr_index_block_find(inode, blk_bh,

						   name_index,