Unverified Commit 125b391e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12909 btrfs: fix uninitialized pointer free on read_alloc_one_name() error 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SF65VUDR5RHZEEBMSGNFUUPD63QEDD4C/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB0EN2 
 
Link:https://gitee.com/openeuler/kernel/pulls/12909

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 62b6fca2 d646a90c

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;