]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: dsa: Fix off-by-one in switch address parsing
authorFlorian Fainelli <f.fainelli@gmail.com>
Sun, 12 Jul 2015 01:02:11 +0000 (18:02 -0700)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 10 Aug 2015 16:10:19 +0000 (17:10 +0100)
commit c8cf89f73f3d9ecbdea479778f0ac714be79be33 upstream.

cd->sw_addr is used as a MDIO bus address, which cannot exceed
PHY_MAX_ADDR (32), our check was off-by-one.

Fixes: 5e95329b701c ("dsa: add device tree bindings to register DSA switches")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
net/dsa/dsa.c

index d3ca32dc167f2f5e847ed6e2116ec20b3f1262d6..a3c70870448f593f94c0b5fecc0693744531e40e 100644 (file)
@@ -418,7 +418,7 @@ static int dsa_of_probe(struct platform_device *pdev)
                        continue;
 
                cd->sw_addr = be32_to_cpup(sw_addr);
-               if (cd->sw_addr > PHY_MAX_ADDR)
+               if (cd->sw_addr >= PHY_MAX_ADDR)
                        continue;
 
                for_each_available_child_of_node(child, port) {