platform/loongarch: laptop: Unregister generic_sub_drivers on exit

[PATCH] platform/loongarch: laptop: Unregister generic_sub_drivers on exit

Posted by Yao Zi 6 months, 2 weeks ago

Without correct unregisteration, ACPI notify handlers and the platform
driver installed by generic_subdriver_init will become dangling
references after removing loongson_laptop module, triggering various
kernel faults when a hotkey is sent or at kernel shutdown.

Cc: stable@vger.kernel.org
Fixes: 6246ed09111f ("LoongArch: Add ACPI-based generic laptop driver")
Signed-off-by: Yao Zi <ziyao@disroot.org>
---
 drivers/platform/loongarch/loongson-laptop.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/loongarch/loongson-laptop.c b/drivers/platform/loongarch/loongson-laptop.c
index 99203584949d..cfe2cf79dbbe 100644
--- a/drivers/platform/loongarch/loongson-laptop.c
+++ b/drivers/platform/loongarch/loongson-laptop.c
@@ -611,11 +611,17 @@ static int __init generic_acpi_laptop_init(void)
 
 static void __exit generic_acpi_laptop_exit(void)
 {
+	int i;
+
 	if (generic_inputdev) {
-		if (input_device_registered)
+		if (input_device_registered) {
 			input_unregister_device(generic_inputdev);
-		else
+
+			for (i = 0; i < ARRAY_SIZE(generic_sub_drivers); i++)
+				generic_subdriver_exit(&generic_sub_drivers[i]);
+		} else {
 			input_free_device(generic_inputdev);
+		}
 	}
 }
 
-- 
2.49.0

Re: [PATCH] platform/loongarch: laptop: Unregister generic_sub_drivers on exit

Posted by Huacai Chen 6 months, 2 weeks ago

Applied, thanks.

Huacai

On Thu, Jun 5, 2025 at 1:56 PM Yao Zi <ziyao@disroot.org> wrote:
>
> Without correct unregisteration, ACPI notify handlers and the platform
> driver installed by generic_subdriver_init will become dangling
> references after removing loongson_laptop module, triggering various
> kernel faults when a hotkey is sent or at kernel shutdown.
>
> Cc: stable@vger.kernel.org
> Fixes: 6246ed09111f ("LoongArch: Add ACPI-based generic laptop driver")
> Signed-off-by: Yao Zi <ziyao@disroot.org>
> ---
>  drivers/platform/loongarch/loongson-laptop.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/loongarch/loongson-laptop.c b/drivers/platform/loongarch/loongson-laptop.c
> index 99203584949d..cfe2cf79dbbe 100644
> --- a/drivers/platform/loongarch/loongson-laptop.c
> +++ b/drivers/platform/loongarch/loongson-laptop.c
> @@ -611,11 +611,17 @@ static int __init generic_acpi_laptop_init(void)
>
>  static void __exit generic_acpi_laptop_exit(void)
>  {
> +       int i;
> +
>         if (generic_inputdev) {
> -               if (input_device_registered)
> +               if (input_device_registered) {
>                         input_unregister_device(generic_inputdev);
> -               else
> +
> +                       for (i = 0; i < ARRAY_SIZE(generic_sub_drivers); i++)
> +                               generic_subdriver_exit(&generic_sub_drivers[i]);
> +               } else {
>                         input_free_device(generic_inputdev);
> +               }
>         }
>  }
>
> --
> 2.49.0
>