iommu: Check for iommu_ops == NULL in iommu_probe_device()

joergroedel · joergroedel · commit dc9de8a2b20f · 2018-12-20T10:02:20.000+01:00
This check needs to be there and got lost at some point during development. Add it again. Fixes: 641fb0e ('iommu/of: Don't call iommu_ops->add_device directly') Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Reported-by: kernelci.org bot <bot@kernelci.org> Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -114,10 +114,14 @@ void iommu_device_unregister(struct iommu_device *iommu)
 int iommu_probe_device(struct device *dev)
 {
 	const struct iommu_ops *ops = dev->bus->iommu_ops;
+	int ret = -EINVAL;
 
 	WARN_ON(dev->iommu_group);
 
-	return ops->add_device(dev);
+	if (ops)
+		ret = ops->add_device(dev);
+
+	return ret;
 }
 
 void iommu_release_device(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,14 @@ void iommu_device_unregister(struct iommu_device *iommu)`
`114`	`114`	`int iommu_probe_device(struct device *dev)`
`115`	`115`	`{`
`116`	`116`	`const struct iommu_ops *ops = dev->bus->iommu_ops;`
	`117`	`+ int ret = -EINVAL;`
`117`	`118`
`118`	`119`	`WARN_ON(dev->iommu_group);`
`119`	`120`
`120`		`- return ops->add_device(dev);`
	`121`	`+ if (ops)`
	`122`	`+ ret = ops->add_device(dev);`
	`123`	`+`
	`124`	`+ return ret;`
`121`	`125`	`}`
`122`	`126`
`123`	`127`	`void iommu_release_device(struct device *dev)`