Commit d646a90c authored by Roi Martin's avatar Roi Martin Committed by Baokun Li
Browse files

btrfs: fix uninitialized pointer free on read_alloc_one_name() error 

stable inclusion
from stable-v6.6.58
commit 7fc7c47b9ba0cf2d192f2117a64b24881b0b577f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB0EN2
CVE: CVE-2024-50087

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

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

commit 2ab5e243c2266c841e0f6904fad1514b18eaf510 upstream.

The function read_alloc_one_name() does not initialize the name field of
the passed fscrypt_str struct if kmalloc fails to allocate the
corresponding buffer.  Thus, it is not guaranteed that
fscrypt_str.name is initialized when freeing it.

This is a follow-up to the linked patch that fixes the remaining
instances of the bug introduced by commit e43eec81 ("btrfs: use
struct qstr instead of name and namelen pairs").

Link: https://lore.kernel.org/linux-btrfs/20241009080833.1355894-1-jroi.martin@gmail.com/


Fixes: e43eec81 ("btrfs: use struct qstr instead of name and namelen pairs")
CC: stable@vger.kernel.org # 6.1+
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarRoi Martin <jroi.martin@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent bc1376a3

fs/btrfs/tree-log.c

+2 −2
Original line number Diff line number Diff line
@@ -1846,7 +1846,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, 
				    struct btrfs_dir_item *di,

				    struct btrfs_key *key)

{

	struct fscrypt_str name;

	struct fscrypt_str name = { 0 };

	struct btrfs_dir_item *dir_dst_di;

	struct btrfs_dir_item *index_dst_di;

	bool dir_dst_matches = false;
@@ -2126,7 +2126,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, 
	struct extent_buffer *eb;

	int slot;

	struct btrfs_dir_item *di;

	struct fscrypt_str name;

	struct fscrypt_str name = { 0 };

	struct inode *inode = NULL;

	struct btrfs_key location;