From: Guenter Roeck <linux@roeck-us.net>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Jean Delvare <jdelvare@suse.com>,
Thierry Reding <thierry.reding@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
linux-hwmon@vger.kernel.org, linux-pwm@vger.kernel.org,
kernel@pengutronix.de
Subject: Re: [PATCH 1/2] hwmon: pwm-fan: Ensure that calculation doesn't discard big period values
Date: Wed, 30 Dec 2020 08:20:42 -0800 [thread overview]
Message-ID: <20201230162042.GA102327@roeck-us.net> (raw)
In-Reply-To: <20201215092031.152243-1-u.kleine-koenig@pengutronix.de>
On Tue, Dec 15, 2020 at 10:20:30AM +0100, Uwe Kleine-König wrote:
> With MAX_PWM being defined to 255 the code
>
> unsigned long period;
> ...
> period = ctx->pwm->args.period;
> state.duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM);
>
> calculates a too small value for duty_cycle if the configured period is
> big (either by discarding the 64 bit value ctx->pwm->args.period or by
> overflowing the multiplication). As this results in a too slow fan and
> so maybe an overheating machine better be safe than sorry and error out
> in .probe.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/pwm-fan.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>
> base-commit: 2c85ebc57b3e1817b6ce1a6b703928e113a90442
>
> diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
> index 1f63807c0399..ec171f2b684a 100644
> --- a/drivers/hwmon/pwm-fan.c
> +++ b/drivers/hwmon/pwm-fan.c
> @@ -324,8 +324,18 @@ static int pwm_fan_probe(struct platform_device *pdev)
>
> ctx->pwm_value = MAX_PWM;
>
> - /* Set duty cycle to maximum allowed and enable PWM output */
> pwm_init_state(ctx->pwm, &state);
> + /*
> + * __set_pwm assumes that MAX_PWM * (period - 1) fits into an unsigned
> + * long. Check this here to prevent the fan running at a too low
> + * frequency.
> + */
> + if (state.period > ULONG_MAX / MAX_PWM + 1) {
> + dev_err(dev, "Configured period too big\n");
> + return -EINVAL;
> + }
> +
> + /* Set duty cycle to maximum allowed and enable PWM output */
> state.duty_cycle = ctx->pwm->args.period - 1;
> state.enabled = true;
>
prev parent reply other threads:[~2020-12-30 16:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 9:20 [PATCH 1/2] hwmon: pwm-fan: Ensure that calculation doesn't discard big period values Uwe Kleine-König
2020-12-15 9:20 ` [PATCH 2/2] hwmon: pwm-fan: stop using legacy PWM functions and some cleanups Uwe Kleine-König
2020-12-15 11:45 ` Paul Barker
2020-12-30 16:35 ` Guenter Roeck
2021-01-12 19:13 ` [PATCH] " Uwe Kleine-König
2021-01-23 16:37 ` Guenter Roeck
2020-12-15 11:29 ` [PATCH 1/2] hwmon: pwm-fan: Ensure that calculation doesn't discard big period values Paul Barker
2020-12-15 12:56 ` Uwe Kleine-König
2020-12-15 13:29 ` Paul Barker
2020-12-30 16:20 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201230162042.GA102327@roeck-us.net \
--to=linux@roeck-us.net \
--cc=b.zolnierkie@samsung.com \
--cc=jdelvare@suse.com \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox