| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 29 Oct 2012 09:33:33 +0000 From: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com> To: broonie@...nsource.wolfsonmicro.com, lrg@...com Cc: linux-kernel@...r.kernel.org, patches@...nsource.wolfsonmicro.com Subject: [PATCH] regulator: core: Move regulator release to avoid deadlock regulator_put function was called whilst holding the regulator_list_mutex, which is also locked from regulator_put. This causes deadlock when failing to register a regulator. This patch adds a second exit point for the regulator_register function which releases the mutex and then cleans up the supply. Signed-off-by: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com> --- drivers/regulator/core.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5c4829c..e68754c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3444,15 +3444,18 @@ unset_supplies: unset_regulator_supplies(rdev); scrub: - if (rdev->supply) - regulator_put(rdev->supply); if (rdev->ena_gpio) gpio_free(rdev->ena_gpio); kfree(rdev->constraints); device_unregister(&rdev->dev); + + mutex_unlock(®ulator_list_mutex); + if (rdev->supply) + regulator_put(rdev->supply); + /* device core frees rdev */ rdev = ERR_PTR(ret); - goto out; + return rdev; clean: kfree(rdev); -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists