Merge branch 'dsa-of-parsing-fixes'

davem330 · davem330 · commit 76b63da9666f · 2015-07-11T23:25:16.000-07:00
Florian Fainelli says:

====================
net: dsa: OF parsing fixes

This patch series fixes two small parsing issues, the first one was
reported by Dan, the second came after looking more closely at the
code.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
@@ -630,7 +630,7 @@ static int dsa_of_probe(struct device *dev)
 			continue;
 
 		cd->sw_addr = be32_to_cpup(sw_addr);
-		if (cd->sw_addr > PHY_MAX_ADDR)
+		if (cd->sw_addr >= PHY_MAX_ADDR)
 			continue;
 
 		if (!of_property_read_u32(child, "eeprom-length", &eeprom_len))
@@ -642,6 +642,8 @@ static int dsa_of_probe(struct device *dev)
 				continue;
 
 			port_index = be32_to_cpup(port_reg);
+			if (port_index >= DSA_MAX_PORTS)
+				break;
 
 			port_name = of_get_property(port, "label", NULL);
 			if (!port_name)
@@ -666,8 +668,6 @@ static int dsa_of_probe(struct device *dev)
 					goto out_free_chip;
 			}
 
-			if (port_index == DSA_MAX_PORTS)
-				break;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ static int dsa_of_probe(struct device *dev)`
`630`	`630`	`continue;`
`631`	`631`
`632`	`632`	`cd->sw_addr = be32_to_cpup(sw_addr);`
`633`		`- if (cd->sw_addr > PHY_MAX_ADDR)`
	`633`	`+ if (cd->sw_addr >= PHY_MAX_ADDR)`
`634`	`634`	`continue;`
`635`	`635`
`636`	`636`	`if (!of_property_read_u32(child, "eeprom-length", &eeprom_len))`
`@@ -642,6 +642,8 @@ static int dsa_of_probe(struct device *dev)`
`642`	`642`	`continue;`
`643`	`643`
`644`	`644`	`port_index = be32_to_cpup(port_reg);`
	`645`	`+ if (port_index >= DSA_MAX_PORTS)`
	`646`	`+ break;`
`645`	`647`
`646`	`648`	`port_name = of_get_property(port, "label", NULL);`
`647`	`649`	`if (!port_name)`
`@@ -666,8 +668,6 @@ static int dsa_of_probe(struct device *dev)`
`666`	`668`	`goto out_free_chip;`
`667`	`669`	`}`
`668`	`670`
`669`		`- if (port_index == DSA_MAX_PORTS)`
`670`		`- break;`
`671`	`671`	`}`
`672`	`672`	`}`
`673`	`673`