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

!7548 btrfs: fix information leak in btrfs_ioctl_logical_to_ino() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XVTX37WXQMACGTKK4MJTHSXC7L6FBGVK/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q9HO 
 
Link:https://gitee.com/openeuler/kernel/pulls/7548

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3e487df5 1eddbe50

fs/btrfs/backref.c

+3 −9
Original line number Diff line number Diff line
@@ -2315,20 +2315,14 @@ struct btrfs_data_container *init_data_container(u32 total_bytes) 
	size_t alloc_bytes;



	alloc_bytes = max_t(size_t, total_bytes, sizeof(*data));

	data = kvmalloc(alloc_bytes, GFP_KERNEL);

	data = kvzalloc(alloc_bytes, GFP_KERNEL);

	if (!data)

		return ERR_PTR(-ENOMEM);



	if (total_bytes >= sizeof(*data)) {

	if (total_bytes >= sizeof(*data))

		data->bytes_left = total_bytes - sizeof(*data);

		data->bytes_missing = 0;

	} else {

	else

		data->bytes_missing = sizeof(*data) - total_bytes;

		data->bytes_left = 0;

	}



	data->elem_cnt = 0;

	data->elem_missed = 0;



	return data;

}