Re: [PATCH] mmc: core: Fix warning and undefined behavior in mmc voltage handling

From: Ulf Hansson
Date: Mon Apr 29 2019 - 06:45:17 EST


On Tue, 16 Apr 2019 at 09:58, Pavel Machek <pavel@xxxxxx> wrote:
>
>
> !voltage_ranges is tested for too late, allowing warning and undefined
> behavior. Fix that.
>
> Signed-off-by: Pavel Machek <pavel@xxxxxx>

Applied for next, thanks!

Kind regards
Uffe


>
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index 3a4402a..b3fa9c9 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -363,11 +363,11 @@ int mmc_of_parse_voltage(struct device_node *np, u32 *mask)
> int num_ranges, i;
>
> voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
> - num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
> if (!voltage_ranges) {
> pr_debug("%pOF: voltage-ranges unspecified\n", np);
> return 0;
> }
> + num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
> if (!num_ranges) {
> pr_err("%pOF: voltage-ranges empty\n", np);
> return -EINVAL;
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html