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

!14065 vp_vdpa: fix id_table array not null terminated error 

Merge Pull Request from: @ci-robot 
 
PR sync from: liukai <liukai284@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FX77L62GJ4CDJJCMZGEXWVP3CBIQB4H5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB8IUJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14065

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents d89ddc49 241cd7b8

drivers/vdpa/virtio_pci/vp_vdpa.c

+7 −3
Original line number Diff line number Diff line
@@ -591,7 +591,11 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto mdev_err;

	}



	mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL);

	/*

	 * id_table should be a null terminated array, so allocate one additional

	 * entry here, see vdpa_mgmtdev_get_classes().

	 */

	mdev_id = kcalloc(2, sizeof(struct virtio_device_id), GFP_KERNEL);

	if (!mdev_id) {

		err = -ENOMEM;

		goto mdev_id_err;
@@ -611,8 +615,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto probe_err;

	}



	mdev_id->device = mdev->id.device;

	mdev_id->vendor = mdev->id.vendor;

	mdev_id[0].device = mdev->id.device;

	mdev_id[0].vendor = mdev->id.vendor;

	mgtdev->id_table = mdev_id;

	mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev);

	mgtdev->supported_features = vp_modern_get_features(mdev);