Commit 6224bca1 authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Baokun Li
Browse files

ext4: return error on ext4_find_inline_entry 

stable inclusion
from stable-v5.10.227
commit e65f698736b053afac80ce6873f2548170cbae0d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYPK6
CVE: CVE-2024-47701

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



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

[ Upstream commit 4d231b91a944f3cab355fce65af5871fb5d7735b ]

In case of errors when reading an inode from disk or traversing inline
directory entries, return an error-encoded ERR_PTR instead of returning
NULL. ext4_find_inline_entry only caller, __ext4_find_entry already returns
such encoded errors.

Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@igalia.com>
Link: https://patch.msgid.link/20240821152324.3621860-3-cascardo@igalia.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: c6b72f5d82b1 ("ext4: avoid OOB when system.data xattr changes underneath the filesystem")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent 1274d55e

fs/ext4/inline.c

+7 −3
Original line number Diff line number Diff line
@@ -1650,8 +1650,9 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir, 
	void *inline_start;

	int inline_size;



	if (ext4_get_inode_loc(dir, &iloc))

		return NULL;

	ret = ext4_get_inode_loc(dir, &iloc);

	if (ret)

		return ERR_PTR(ret);



	down_read(&EXT4_I(dir)->xattr_sem);

	if (!ext4_has_inline_data(dir)) {
@@ -1682,6 +1683,9 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir, 


out:

	brelse(iloc.bh);

	if (ret < 0)

		iloc.bh = ERR_PTR(ret);

	else

		iloc.bh = NULL;

out_find:

	up_read(&EXT4_I(dir)->xattr_sem);