]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
iommu/omap: Fix regression in probe for NULL pointer dereference
authorTony Lindgren <tony@atomide.com>
Thu, 31 Mar 2022 06:23:01 +0000 (09:23 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:41:11 +0000 (14:41 +0200)
commit8cd3ffc220418901d5bff037fcf06c455e67ad8b
tree69ffa5340ed50732a94e95e1d3b94adf44a4ab3d
parent895a71230eec4a899fc0f803dcc0f997b37a1ad1
iommu/omap: Fix regression in probe for NULL pointer dereference

BugLink: https://bugs.launchpad.net/bugs/1969107
[ Upstream commit 71ff461c3f41f6465434b9e980c01782763e7ad8 ]

Commit 3f6634d997db ("iommu: Use right way to retrieve iommu_ops") started
triggering a NULL pointer dereference for some omap variants:

__iommu_probe_device from probe_iommu_group+0x2c/0x38
probe_iommu_group from bus_for_each_dev+0x74/0xbc
bus_for_each_dev from bus_iommu_probe+0x34/0x2e8
bus_iommu_probe from bus_set_iommu+0x80/0xc8
bus_set_iommu from omap_iommu_init+0x88/0xcc
omap_iommu_init from do_one_initcall+0x44/0x24

This is caused by omap iommu probe returning 0 instead of ERR_PTR(-ENODEV)
as noted by Jason Gunthorpe <jgg@ziepe.ca>.

Looks like the regression already happened with an earlier commit
6785eb9105e3 ("iommu/omap: Convert to probe/release_device() call-backs")
that changed the function return type and missed converting one place.

Cc: Drew Fustini <dfustini@baylibre.com>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Suman Anna <s-anna@ti.com>
Suggested-by: Jason Gunthorpe <jgg@ziepe.ca>
Fixes: 6785eb9105e3 ("iommu/omap: Convert to probe/release_device() call-backs")
Fixes: 3f6634d997db ("iommu: Use right way to retrieve iommu_ops")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Drew Fustini <dfustini@baylibre.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220331062301.24269-1-tony@atomide.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 47e239117bd97c8556f9187af7a9a7938db4e021)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/iommu/omap-iommu.c