| From | Kamal Mostafa <> | Subject | [PATCH 3.13.y-ckt 50/53] net: dsa: Fix off-by-one in switch address parsing | Date | Thu, 6 Aug 2015 13:38:15 -0700 |
| |
3.13.11-ckt25 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <f.fainelli@gmail.com>
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: Kamal Mostafa <kamal@canonical.com> --- net/dsa/dsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 0eb5d5e..ba6e12a 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -417,7 +417,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) { -- 1.9.1
|