Commit 8f5063e9 authored Jul 11, 2015 by Florian Fainelli Committed by David S. Miller Jul 11, 2015

net: dsa: Test array index before use



port_index is used an index into an array, and this information comes
from Device Tree, make sure that port_index is not equal to the array
size before using it. Move the check against port_index earlier in the
loop.

Fixes: 5e95329b: ("dsa: add device tree bindings to register DSA switches")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2ee94014

net/dsa/dsa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}