summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon/executive
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nsn.com>2013-11-01 16:06:03 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-01-23 13:02:34 +0100
commit8b75e77048a378339ada86eff548a5b253212859 (patch)
treef272c76611a119a69f01238e4d91ca0f5fc97fa3 /arch/mips/cavium-octeon/executive
parentMIPS: JZ4740: reuse UART0 address macro for vmlinuz debug port (diff)
downloadlinux-8b75e77048a378339ada86eff548a5b253212859.tar.xz
linux-8b75e77048a378339ada86eff548a5b253212859.zip
MIPS: cavium-octeon: fix out-of-bounds array access
When booting with in-kernel DTBs, the pruning code will enumerate interfaces 0-4. However, there is memory reserved only for 4 so some other data will get overwritten by cvmx_helper_interface_enumerate(). Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com> Acked-by: David Daney <david.daney@cavium.com> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6102/
Diffstat (limited to 'arch/mips/cavium-octeon/executive')
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index d63d20dfbfb0..0e4b34036815 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -67,7 +67,7 @@ void (*cvmx_override_pko_queue_priority) (int pko_port,
void (*cvmx_override_ipd_port_setup) (int ipd_port);
/* Port count per interface */
-static int interface_port_count[4] = { 0, 0, 0, 0 };
+static int interface_port_count[5];
/* Port last configured link info index by IPD/PKO port */
static cvmx_helper_link_info_t