Skip to content

Commit 2d74bd3

Browse files
committed
Merge tag 'acpi-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI support fix from Rafael Wysocki: "Prevent use-after-free from occurring on reduced-hardware ACPI platforms when -EPROBE_DEFER is returned by ec_install_handlers() during ACPI EC driver initialization (Weiming Shi)" * tag 'acpi-7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: EC: clean up handlers on probe failure in acpi_ec_setup()
2 parents 25b69eb + f6484ca commit 2d74bd3

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/acpi/ec.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,8 @@ static int acpi_ec_setup(struct acpi_ec *ec, struct acpi_device *device, bool ca
16561656

16571657
ret = ec_install_handlers(ec, device, call_reg);
16581658
if (ret) {
1659+
ec_remove_handlers(ec);
1660+
16591661
if (ec == first_ec)
16601662
first_ec = NULL;
16611663

0 commit comments

Comments
 (0)