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
| ||
|
Message-ID: <1445042458-30725-2-git-send-email-jonathar@broadcom.com> Date: Fri, 16 Oct 2015 17:40:58 -0700 From: Jonathan Richardson <jonathar@...adcom.com> To: Tim Kryger <tim.kryger@...il.com>, Dmitry Torokhov <dtor@...gle.com>, Anatol Pomazau <anatol@...gle.com>, Arun Ramamurthy <arun.ramamurthy@...adcom.com>, Thierry Reding <thierry.reding@...il.com> CC: Scott Branden <sbranden@...adcom.com>, Jonathan Richardson <jonathar@...adcom.com>, bcm-kernel-feedback-list <bcm-kernel-feedback-list@...adcom.com>, <linux-kernel@...r.kernel.org>, <linux-pwm@...r.kernel.org> Subject: [PATCH v10 1/1] pwm: core: Set enable state properly on failed call to enable The pwm_enable function didn't clear the enabled bit if a call to a clients enable function returned an error. The result was that the state of the pwm core was wrong. Clearing the bit when enable returns an error ensures the state is properly set. Tested-by: Jonathan Richardson <jonathar@...adcom.com> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@...il.com> Signed-off-by: Jonathan Richardson <jonathar@...adcom.com> --- drivers/pwm/core.c | 33 ++++++++++++++++++++++++++------- include/linux/pwm.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 3f9df3e..b8f6c30 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -269,6 +269,7 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip, pwm->pwm = chip->base + i; pwm->hwpwm = i; pwm->polarity = polarity; + mutex_init(&pwm->lock); radix_tree_insert(&pwm_tree, pwm->pwm, pwm); } @@ -473,16 +474,22 @@ int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity) if (!pwm->chip->ops->set_polarity) return -ENOSYS; - if (pwm_is_enabled(pwm)) - return -EBUSY; + mutex_lock(&pwm->lock); + + if (pwm_is_enabled(pwm)) { + err = -EBUSY; + goto unlock; + } err = pwm->chip->ops->set_polarity(pwm->chip, pwm, polarity); if (err) - return err; + goto unlock; pwm->polarity = polarity; - return 0; +unlock: + mutex_unlock(&pwm->lock); + return err; } EXPORT_SYMBOL_GPL(pwm_set_polarity); @@ -494,10 +501,22 @@ EXPORT_SYMBOL_GPL(pwm_set_polarity); */ int pwm_enable(struct pwm_device *pwm) { - if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) - return pwm->chip->ops->enable(pwm->chip, pwm); + int err = 0; + + if (!pwm) + return -EINVAL; + + mutex_lock(&pwm->lock); + + if (!test_and_set_bit(PWMF_ENABLED, &pwm->flags)) { + err = pwm->chip->ops->enable(pwm->chip, pwm); + if (err) + clear_bit(PWMF_ENABLED, &pwm->flags); + } + + mutex_unlock(&pwm->lock); - return pwm ? 0 : -EINVAL; + return err; } EXPORT_SYMBOL_GPL(pwm_enable); diff --git a/include/linux/pwm.h b/include/linux/pwm.h index d681f68..dee7d65 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -3,6 +3,7 @@ #include <linux/err.h> #include <linux/of.h> +#include <linux/mutex.h> struct pwm_device; struct seq_file; @@ -98,6 +99,7 @@ struct pwm_device { unsigned int pwm; struct pwm_chip *chip; void *chip_data; + struct mutex lock; unsigned int period; unsigned int duty_cycle; -- 1.9.1 -- 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