Skip to content

Commit d819169

Browse files
Yang Yingliangchenhuacai
authored andcommitted
platform/loongarch: laptop: Fix possible UAF and simplify generic_acpi_laptop_init()
Currently the return value of 'sub_driver->init' is not checked. If sparse_keymap_setup() called in the init function fails, 'generic_ inputdev' is freed, then it will lead a UAF when using it in generic_ acpi_laptop_init(). Fix it by checking the return value and setting generic_inputdev to NULL after free, so as to avoid double free it. The error code in generic_subdriver_init() is always negative, so the return of generic_subdriver_init() can be simplified. Fixes: 6246ed0 ("LoongArch: Add ACPI-based generic laptop driver") Signed-off-by: Yang Yingliang <[email protected]> Signed-off-by: Huacai Chen <[email protected]>
1 parent fbe605a commit d819169

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/platform/loongarch/loongson-laptop.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ static int __init event_init(struct generic_sub_driver *sub_driver)
448448
if (ret < 0) {
449449
pr_err("Failed to setup input device keymap\n");
450450
input_free_device(generic_inputdev);
451+
generic_inputdev = NULL;
451452

452453
return ret;
453454
}
@@ -502,8 +503,11 @@ static int __init generic_subdriver_init(struct generic_sub_driver *sub_driver)
502503
if (ret)
503504
return -EINVAL;
504505

505-
if (sub_driver->init)
506-
sub_driver->init(sub_driver);
506+
if (sub_driver->init) {
507+
ret = sub_driver->init(sub_driver);
508+
if (ret)
509+
goto err_out;
510+
}
507511

508512
if (sub_driver->notify) {
509513
ret = setup_acpi_notify(sub_driver);
@@ -519,7 +523,7 @@ static int __init generic_subdriver_init(struct generic_sub_driver *sub_driver)
519523

520524
err_out:
521525
generic_subdriver_exit(sub_driver);
522-
return (ret < 0) ? ret : 0;
526+
return ret;
523527
}
524528

525529
static void generic_subdriver_exit(struct generic_sub_driver *sub_driver)

0 commit comments

Comments
 (0)