Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9f3a26 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

MIPS: OCTEON: fix out of bounds array access on CN68XX 



commit c0fae7e2452b90c31edd2d25eb3baf0c76b400ca upstream.

The maximum number of interfaces is returned by
cvmx_helper_get_number_of_interfaces(), and the value is used to access
interface_port_count[]. When CN68XX support was added, we forgot
to increase the array size. Fix that.

Fixes: 2c8c3f02 ("MIPS: Octeon: Support additional interfaces on CN68XX")
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20949/


Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org # v4.3+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66eb08ae

arch/mips/cavium-octeon/executive/cvmx-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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[5];

static int interface_port_count[9];



/**

 * Return the number of interfaces the chip has. Each interface