From: Greg Kroah-Hartman Date: Fri, 13 Feb 2026 13:46:38 +0000 (+0100) Subject: 6.18-stable patches X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: gpio-omap-do-not-register-driver-in-probe.patch --- diff --git a/queue-6.18/gpio-omap-do-not-register-driver-in-probe.patch b/queue-6.18/gpio-omap-do-not-register-driver-in-probe.patch new file mode 100644 index 0000000000..fd75da2e49 --- /dev/null +++ b/queue-6.18/gpio-omap-do-not-register-driver-in-probe.patch @@ -0,0 +1,85 @@ +From 730e5ebff40c852e3ea57b71bf02a4b89c69435f Mon Sep 17 00:00:00 2001 +From: Danilo Krummrich +Date: Tue, 27 Jan 2026 21:17:12 +0100 +Subject: gpio: omap: do not register driver in probe() + +From: Danilo Krummrich + +commit 730e5ebff40c852e3ea57b71bf02a4b89c69435f upstream. + +Commit 11a78b794496 ("ARM: OMAP: MPUIO wake updates") registers the +omap_mpuio_driver from omap_mpuio_init(), which is called from +omap_gpio_probe(). + +However, it neither makes sense to register drivers from probe() +callbacks of other drivers, nor does the driver core allow registering +drivers with a device lock already being held. + +The latter was revealed by commit dc23806a7c47 ("driver core: enforce +device_lock for driver_match_device()") leading to a potential deadlock +condition described in [1]. + +Additionally, the omap_mpuio_driver is never unregistered from the +driver core, even if the module is unloaded. + +Hence, register the omap_mpuio_driver from the module initcall and +unregister it in module_exit(). + +Link: https://lore.kernel.org/lkml/DFU7CEPUSG9A.1KKGVW4HIPMSH@kernel.org/ [1] +Fixes: dc23806a7c47 ("driver core: enforce device_lock for driver_match_device()") +Fixes: 11a78b794496 ("ARM: OMAP: MPUIO wake updates") +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Danilo Krummrich +Reviewed-by: Rafael J. Wysocki (Intel) +Link: https://patch.msgid.link/20260127201725.35883-1-dakr@kernel.org +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpio/gpio-omap.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +--- a/drivers/gpio/gpio-omap.c ++++ b/drivers/gpio/gpio-omap.c +@@ -799,10 +799,13 @@ static struct platform_device omap_mpuio + + static inline void omap_mpuio_init(struct gpio_bank *bank) + { +- platform_set_drvdata(&omap_mpuio_device, bank); ++ static bool registered; + +- if (platform_driver_register(&omap_mpuio_driver) == 0) +- (void) platform_device_register(&omap_mpuio_device); ++ platform_set_drvdata(&omap_mpuio_device, bank); ++ if (!registered) { ++ (void)platform_device_register(&omap_mpuio_device); ++ registered = true; ++ } + } + + /*---------------------------------------------------------------------*/ +@@ -1576,13 +1579,24 @@ static struct platform_driver omap_gpio_ + */ + static int __init omap_gpio_drv_reg(void) + { +- return platform_driver_register(&omap_gpio_driver); ++ int ret; ++ ++ ret = platform_driver_register(&omap_mpuio_driver); ++ if (ret) ++ return ret; ++ ++ ret = platform_driver_register(&omap_gpio_driver); ++ if (ret) ++ platform_driver_unregister(&omap_mpuio_driver); ++ ++ return ret; + } + postcore_initcall(omap_gpio_drv_reg); + + static void __exit omap_gpio_exit(void) + { + platform_driver_unregister(&omap_gpio_driver); ++ platform_driver_unregister(&omap_mpuio_driver); + } + module_exit(omap_gpio_exit); + diff --git a/queue-6.18/series b/queue-6.18/series index 7f85b7d082..8f785247b2 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -46,3 +46,4 @@ xfs-fix-uaf-in-xchk_btree_check_block_owner.patch drm-exynos-vidi-use-ctx-lock-to-protect-struct-vidi_context-member-variables-related-to-memory-alloc-free.patch pci-endpoint-avoid-creating-sub-groups-asynchronously.patch wifi-rtl8xxxu-fix-slab-out-of-bounds-in-rtl8xxxu_sta_add.patch +gpio-omap-do-not-register-driver-in-probe.patch