diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-10 19:28:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-10 19:28:37 +0000 |
| commit | 34711f941c4a212e3bdf3b993ff6bfe1d21e4594 (patch) | |
| tree | 6c098e09163ce930ab143b118870cdaf3f6bbbe8 /target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch | |
| parent | e87aa5f56809e5becf9da7aca5098a87caeccb2e (diff) | |
| download | master-187ad058-34711f941c4a212e3bdf3b993ff6bfe1d21e4594.tar.gz master-187ad058-34711f941c4a212e3bdf3b993ff6bfe1d21e4594.tar.bz2 master-187ad058-34711f941c4a212e3bdf3b993ff6bfe1d21e4594.zip | |
octeon: backport a few upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41568 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch')
| -rw-r--r-- | target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch b/target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch new file mode 100644 index 0000000000..78194bf261 --- /dev/null +++ b/target/linux/octeon/patches-3.10/0008-MIPS-cavium-octeon-fix-out-of-bounds-array-access.patch @@ -0,0 +1,28 @@ +From 8b75e77048a378339ada86eff548a5b253212859 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen <aaro.koskinen@nsn.com> +Date: Fri, 1 Nov 2013 17:06:03 +0200 +Subject: [PATCH] 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/ +--- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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) + 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 |