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

!14655 vfio/mlx5: Fix an unwind issue in mlx5vf_add_migration_pages() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/E7NJYMV3LFXDCPMLS5KHVBH3OPFE5K43/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEGF7 
 
Link:https://gitee.com/openeuler/kernel/pulls/14655

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents cd38c28c 05af4ffc

drivers/vfio/pci/mlx5/main.c

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ int mlx5vf_add_migration_pages(struct mlx5_vhca_data_buffer *buf, 
	unsigned long filled;

	unsigned int to_fill;

	int ret;

	int i;



	to_fill = min_t(unsigned int, npages, PAGE_SIZE / sizeof(*page_list));

	page_list = kvzalloc(to_fill * sizeof(*page_list), GFP_KERNEL_ACCOUNT);
@@ -91,7 +92,7 @@ int mlx5vf_add_migration_pages(struct mlx5_vhca_data_buffer *buf, 
			GFP_KERNEL_ACCOUNT);



		if (ret)

			goto err;

			goto err_append;

		buf->allocated_length += filled * PAGE_SIZE;

		/* clean input for another bulk allocation */

		memset(page_list, 0, filled * sizeof(*page_list));
@@ -102,6 +103,9 @@ int mlx5vf_add_migration_pages(struct mlx5_vhca_data_buffer *buf, 
	kvfree(page_list);

	return 0;



err_append:

	for (i = filled - 1; i >= 0; i--)

		__free_page(page_list[i]);

err:

	kvfree(page_list);

	return ret;