Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

virtio: pci: Check virtio configs are mapped

Browse source 
Prepare for calls to `virtio_pci_map_capability()` failing by returning
NULL on error. If this happens, later accesses to the pointers would be
unsafe so cause the probe to fail if such an error occurs.

Signed-off-by: Andrew Scull <ascull@google.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Andrew Scull 2022-04-21 16:11:14 +00:00 committed by Tom Rini
parent 2635e3b50f
commit c763e1e023
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/virtio/virtio_pci_modern.c
View file

@ -533,7 +533,19 @@ static int virtio_pci_probe(struct udevice *udev)
return -EINVAL;
}
/* Map configuration structures */
priv->common = virtio_pci_map_capability(udev, &common_cap);
if (!priv->common) {
printf("(%s): could not map common config\n", udev->name);
return -EINVAL;
}
priv->notify_len = notify_cap.length;
priv->notify_base = virtio_pci_map_capability(udev, &notify_cap);
if (!priv->notify_base) {
printf("(%s): could not map notify config\n", udev->name);
return -EINVAL;
}
/*
* Device capability is only mandatory for devices that have
@ -545,11 +557,13 @@ static int virtio_pci_probe(struct udevice *udev)
if (device) {
priv->device_len = device_cap.length;
priv->device = virtio_pci_map_capability(udev, &device_cap);
if (!priv->device) {
printf("(%s): could not map device config\n",
udev->name);
return -EINVAL;
}
}
/* Map configuration structures */
priv->common = virtio_pci_map_capability(udev, &common_cap);
priv->notify_base = virtio_pci_map_capability(udev, &notify_cap);
debug("(%p): common @ %p, notify base @ %p, device @ %p\n",
udev, priv->common, priv->notify_base, priv->device);