Commit 04bbb6f4 authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Yifan Qiao
Browse files

ext4: remove duplicate definition of ext4_xattr_ibody_inline_set() 

stable inclusion
from stable-v5.10.179
commit c75711396c04a77cb614f49d37e7385e984c0cb7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I71Z4N
CVE: CVE-2024-40972

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c75711396c04a77cb614f49d37e7385e984c0cb7



--------------------------------

[ Upstream commit 310c097c ]

ext4_xattr_ibody_inline_set() & ext4_xattr_ibody_set() have the exact
same definition.  Hence remove ext4_xattr_ibody_inline_set() and all
its call references. Convert the callers of it to call
ext4_xattr_ibody_set() instead.

[ Modified to preserve ext4_xattr_ibody_set() and remove
  ext4_xattr_ibody_inline_set() instead. -- TYT ]

Signed-off-by: default avatarRitesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/fd566b799bbbbe9b668eb5eecde5b5e319e3694f.1622685482.git.riteshh@linux.ibm.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarYifan Qiao <qiaoyifan4@huawei.com>
parent 2902ea73

fs/ext4/inline.c

+5 −6
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int ext4_read_inline_data(struct inode *inode, void *buffer, 
/*

 * write the buffer to the inline inode.

 * If 'create' is set, we don't need to do the extra copy in the xattr

 * value since it is already handled by ext4_xattr_ibody_inline_set.

 * value since it is already handled by ext4_xattr_ibody_set.

 * That saves us one memcpy.

 */

static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc,
@@ -289,7 +289,7 @@ static int ext4_create_inline_data(handle_t *handle, 


	BUG_ON(!is.s.not_found);



	error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is);

	error = ext4_xattr_ibody_set(handle, inode, &i, &is);

	if (error) {

		if (error == -ENOSPC)

			ext4_clear_inode_state(inode,
@@ -361,7 +361,7 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode, 
	i.value = value;

	i.value_len = len;



	error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is);

	error = ext4_xattr_ibody_set(handle, inode, &i, &is);

	if (error)

		goto out;
@@ -434,7 +434,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle, 
	if (error)

		goto out;



	error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is);

	error = ext4_xattr_ibody_set(handle, inode, &i, &is);

	if (error)

		goto out;
@@ -1937,8 +1937,7 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline) 
			i.value = value;

			i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ?

					i_size - EXT4_MIN_INLINE_DATA_SIZE : 0;

			err = ext4_xattr_ibody_inline_set(handle, inode,

							  &i, &is);

			err = ext4_xattr_ibody_set(handle, inode, &i, &is);

			if (err)

				goto out_error;

		}

fs/ext4/xattr.c

+1 −26
Original line number Diff line number Diff line
@@ -2206,32 +2206,7 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, 
	return 0;

}



int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode,

				struct ext4_xattr_info *i,

				struct ext4_xattr_ibody_find *is)

{

	struct ext4_xattr_ibody_header *header;

	struct ext4_xattr_search *s = &is->s;

	int error;



	if (!EXT4_INODE_HAS_XATTR_SPACE(inode))

		return -ENOSPC;



	error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */);

	if (error)

		return error;

	header = IHDR(inode, ext4_raw_inode(&is->iloc));

	if (!IS_LAST_ENTRY(s->first)) {

		header->h_magic = cpu_to_le32(EXT4_XATTR_MAGIC);

		ext4_set_inode_state(inode, EXT4_STATE_XATTR);

	} else {

		header->h_magic = cpu_to_le32(0);

		ext4_clear_inode_state(inode, EXT4_STATE_XATTR);

	}

	return 0;

}



static int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,

int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,

				struct ext4_xattr_info *i,

				struct ext4_xattr_ibody_find *is)

{

fs/ext4/xattr.h

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ extern int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, 
extern int ext4_xattr_ibody_get(struct inode *inode, int name_index,

				const char *name,

				void *buffer, size_t buffer_size);

extern int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode,

extern int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,

				struct ext4_xattr_info *i,

				struct ext4_xattr_ibody_find *is);