Skip to contentSkip to conversation

mmc: core: Fix warning and undefined behavior in mmc voltage handling

PATCH In review Pavel Machek 2 participants 2 messages Apr 16, 2019 – Apr 29, 2019 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: core: Fix warning and undefined behavior in mmc voltage handling

!voltage_ranges is tested for too late, allowing warning and undefined behavior. Fix that.

drivers/mmc/core/host.c +1 -1
index 3a4402a..b3fa9c9 100644
@@ -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;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw
Quoted 6 lines · Pavel Machek

!voltage_ranges is tested for too late, allowing warning and undefined behavior. Fix that.

Applied for next, thanks!

Kind regards
Uffe

Quoted 22 lines
drivers/mmc/core/host.c +1 -2
index 3a4402a..b3fa9c9 100644
@@ -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