UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu: Check the result of iommu_group_get() for NULL 

The result of iommu_group_get() was being blindly used in both
attach and detach which results in a dereference when trying
to work with an unknown device.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Jordan Crouse 2017-12-20 09:48:36 -07:00 committed by Alex Williamson
parent 1291a0d504
commit 9ae9df035c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/iommu/iommu.c
View File

@ -1303,6 +1303,9 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev)
int ret; int ret;
group = iommu_group_get(dev); group = iommu_group_get(dev);
if (!group)
return -ENODEV;
/* /*
* Lock the group to make sure the device-count doesn't * Lock the group to make sure the device-count doesn't
* change while we are attaching * change while we are attaching
@ -1341,6 +1344,8 @@ void iommu_detach_device(struct iommu_domain *domain, struct device *dev)
struct iommu_group *group; struct iommu_group *group;
group = iommu_group_get(dev); group = iommu_group_get(dev);
if (!group)
return;
mutex_lock(&group->mutex); mutex_lock(&group->mutex);
if (iommu_group_device_count(group) != 1) { if (iommu_group_device_count(group) != 1) {