iommu/omap: Fix regression in probe for NULL pointer dereference
PATCH 1/1 iommu/omap: Fix regression in probe for NULL pointer dereference
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 <[email protected]>.
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.
--- drivers/iommu/omap-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/omap-iommu.c +1 -1
@@ -1661,7 +1661,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) num_iommus =of_property_count_elems_of_size (dev->of_node,"iommus" ,sizeof (phandle));if (num_iommus <0 ) -return 0 ; +return ERR_PTR (-ENODEV ); arch_data =kcalloc (num_iommus +1 ,sizeof (*arch_data),GFP_KERNEL );if (!arch_data)
Signature · 1 line
2.35.1
Quoted 24 lines · Tony Lindgren
Commit
3f6634d997db("iommu: Use right way to retrieveiommu_ops") started triggering a NULL pointer dereference for some omap variants:
__iommu_probe_devicefromprobe_iommu_group+0x2c/0x38probe_iommu_groupfrombus_for_each_dev+0x74/0xbcbus_for_each_devfrombus_iommu_probe+0x34/0x2e8bus_iommu_probefrombus_set_iommu+0x80/0xc8bus_set_iommufromomap_iommu_init+0x88/0xccomap_iommu_initfromdo_one_initcall+0x44/0x24This is caused by omap iommu probe returning 0 instead of
ERR_PTR(-ENODEV)as noted by Jason Gunthorpe <[email protected]>.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 <[email protected]>Cc Lu Baolu <[email protected]>Cc Suman Anna <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>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 <[email protected]>
Quoted 3 lines
--- drivers/iommu/omap-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Jason
Quoted 42 lines · Tony Lindgren
Commit
3f6634d997db("iommu: Use right way to retrieveiommu_ops") started triggering a NULL pointer dereference for some omap variants:
__iommu_probe_devicefromprobe_iommu_group+0x2c/0x38probe_iommu_groupfrombus_for_each_dev+0x74/0xbcbus_for_each_devfrombus_iommu_probe+0x34/0x2e8bus_iommu_probefrombus_set_iommu+0x80/0xc8bus_set_iommufromomap_iommu_init+0x88/0xccomap_iommu_initfromdo_one_initcall+0x44/0x24This is caused by omap iommu probe returning 0 instead of
ERR_PTR(-ENODEV)as noted by Jason Gunthorpe <[email protected]>.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 <[email protected]>Cc Lu Baolu <[email protected]>Cc Suman Anna <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>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 <[email protected]>--- drivers/iommu/omap-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/omap-iommu.c +1
-1@@ -1661,7 +1661,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) num_iommus =of_property_count_elems_of_size (dev->of_node,"iommus" ,sizeof (phandle));if (num_iommus <0 ) -return 0 ; +return ERR_PTR (-ENODEV ); arch_data =kcalloc (num_iommus +1 ,sizeof (*arch_data),GFP_KERNEL );if (!arch_data)Signature · 1 line
2.35.1
Mainline with omap2plus_defconfig now boots ok on my BeagleBoard-X15 with the TI AM5728 SoC after this patch is applied.
thanks,
drew
Hi,
Quoted 10 lines · Tony Lindgren
Commit
3f6634d997db("iommu: Use right way to retrieveiommu_ops") started triggering a NULL pointer dereference for some omap variants:
__iommu_probe_devicefromprobe_iommu_group+0x2c/0x38probe_iommu_groupfrombus_for_each_dev+0x74/0xbcbus_for_each_devfrombus_iommu_probe+0x34/0x2e8bus_iommu_probefrombus_set_iommu+0x80/0xc8bus_set_iommufromomap_iommu_init+0x88/0xccomap_iommu_initfromdo_one_initcall+0x44/0x24
Quoted 6 lines
This is caused by omap iommu probe returning 0 instead of
ERR_PTR(-ENODEV)as noted by Jason Gunthorpe <[email protected]>.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.
Can you guys please get this fix into the -rc series? Or ack it so I can pick it up into my fixes branch?
Without this fix booting is failing for a bunch of devices.
Regards,
Tony
Quoted 26 lines
Cc Drew Fustini <[email protected]>Cc Lu Baolu <[email protected]>Cc Suman Anna <[email protected]>Suggested-by Jason Gunthorpe <[email protected]>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 <[email protected]>--- drivers/iommu/omap-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/omap-iommu.c +1
-1@@ -1661,7 +1661,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) num_iommus =of_property_count_elems_of_size (dev->of_node,"iommus" ,sizeof (phandle));if (num_iommus <0 ) -return 0 ; +return ERR_PTR (-ENODEV ); arch_data =kcalloc (num_iommus +1 ,sizeof (*arch_data),GFP_KERNEL );if (!arch_data)Signature · 1 line
2.35.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi,
Quoted 18 lines
Am 07.04.2022 um 07:39 schrieb Tony Lindgren <[email protected]>:
Hi,
Quoted 13 lines · Tony Lindgren
Commit
3f6634d997db("iommu: Use right way to retrieveiommu_ops") started triggering a NULL pointer dereference for some omap variants:
__iommu_probe_devicefromprobe_iommu_group+0x2c/0x38probe_iommu_groupfrombus_for_each_dev+0x74/0xbcbus_for_each_devfrombus_iommu_probe+0x34/0x2e8bus_iommu_probefrombus_set_iommu+0x80/0xc8bus_set_iommufromomap_iommu_init+0x88/0xccomap_iommu_initfromdo_one_initcall+0x44/0x24This is caused by omap iommu probe returning 0 instead of
ERR_PTR(-ENODEV)as noted by Jason Gunthorpe <[email protected]>.
Quoted 8 lines
Quoted 3 lines
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.Can you guys please get this fix into the -rc series? Or ack it so I can pick it up into my fixes branch?
Without this fix booting is failing for a bunch of devices.
Yes, I can confirm that v5.18-rc1 does not even boot the GTA04 (omap3) and OMAP5UEVM to any activity without this patch.
Seems to be an urgent fix.
BR and thanks,
Nikolaus
Joerg Roedel
maintainerQuoted 2 lines · Tony Lindgren
Can you guys please get this fix into the -rc series? Or ack it so I can pick it up into my fixes branch?
Sorry for the delay, Covid catched me so I was away from email for almost 2 week. This patch is picked-up now and I will send it upstream for -rc2.
Thanks,
Joerg
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi,
Quoted 7 lines · Joerg Roedel
Quoted 2 lines · Tony Lindgren
Can you guys please get this fix into the -rc series? Or ack it so I can pick it up into my fixes branch?
Sorry for the delay, Covid catched me so I was away from email for almost 2 week. This patch is picked-up now and I will send it upstream for -rc2.
OK welcome back then, and hopefully no serious symptoms. Thanks for picking up the patch.
Regards,
Tony
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu