luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: Test array index before use

Browse Source 
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: 5e95329b70: ("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>
This commit is contained in:
Florian Fainelli 2015-07-11 18:02:10 -07:00 committed by David S. Miller
parent 2ee94014d9
commit 8f5063e97f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/dsa/dsa.c
View File

@ -642,6 +642,8 @@ static int dsa_of_probe(struct device *dev)
continue; continue;
port_index = be32_to_cpup(port_reg); port_index = be32_to_cpup(port_reg);
if (port_index >= DSA_MAX_PORTS)
break;
port_name = of_get_property(port, "label", NULL); port_name = of_get_property(port, "label", NULL);
if (!port_name) if (!port_name)
@ -666,8 +668,6 @@ static int dsa_of_probe(struct device *dev)
goto out_free_chip; goto out_free_chip;
} }
if (port_index == DSA_MAX_PORTS)
break;
} }
} }