From 0aea30317a94e920ce2bc02934e2b057a0916cea Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Nov 2018 09:55:52 -0800 Subject: [PATCH] drop mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch from 3.18 --- ...out-of-bounds-array-access-on-cn68xx.patch | 39 ------------------- queue-3.18/series | 1 - 2 files changed, 40 deletions(-) delete mode 100644 queue-3.18/mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch diff --git a/queue-3.18/mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch b/queue-3.18/mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch deleted file mode 100644 index ce8a0895d94..00000000000 --- a/queue-3.18/mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c0fae7e2452b90c31edd2d25eb3baf0c76b400ca Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen -Date: Sat, 27 Oct 2018 01:46:34 +0300 -Subject: MIPS: OCTEON: fix out of bounds array access on CN68XX - -From: Aaro Koskinen - -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: 2c8c3f0201333 ("MIPS: Octeon: Support additional interfaces on CN68XX") -Signed-off-by: Aaro Koskinen -Signed-off-by: Paul Burton -Patchwork: https://patchwork.linux-mips.org/patch/20949/ -Cc: Ralf Baechle -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org -Cc: stable@vger.kernel.org # v4.3+ -Signed-off-by: Greg Kroah-Hartman - ---- - 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[5]; -+static int interface_port_count[9]; - - /* Port last configured link info index by IPD/PKO port */ - static cvmx_helper_link_info_t diff --git a/queue-3.18/series b/queue-3.18/series index b84a02f2938..d2265ff5716 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -44,7 +44,6 @@ nfsv4.1-fix-the-r-wsize-checking.patch nfsd-fix-an-oops-in-free_session.patch lockd-fix-access-beyond-unterminated-strings-in-prints.patch dm-ioctl-harden-copy_params-s-copy_from_user-from-malicious-users.patch -mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch tc-set-dma-masks-for-devices.patch kgdboc-passing-ekgdboc-to-command-line-causes-panic.patch media-em28xx-use-a-default-format-if-try_fmt-fails.patch -- 2.39.5