From: Greg Kroah-Hartman Date: Wed, 5 Jul 2017 12:34:55 +0000 (+0200) Subject: drop sctp patch from 4.4 and 4.9 queues as it wasn't needed X-Git-Tag: v3.18.60~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97a96deffb09d94f940c43b38733492aa4c63c5a;p=thirdparty%2Fkernel%2Fstable-queue.git drop sctp patch from 4.4 and 4.9 queues as it wasn't needed --- diff --git a/queue-4.4/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch b/queue-4.4/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch deleted file mode 100644 index 98e138cdc6c..00000000000 --- a/queue-4.4/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From foo@baz Mon Jul 3 13:09:11 CEST 2017 -From: Colin Ian King -Date: Fri, 20 Jan 2017 13:01:57 +0000 -Subject: net: sctp: fix array overrun read on sctp_timer_tbl - -From: Colin Ian King - - -[ Upstream commit 0e73fc9a56f22f2eec4d2b2910c649f7af67b74d ] - -The comparison on the timeout can lead to an array overrun -read on sctp_timer_tbl because of an off-by-one error. Fix -this by using < instead of <= and also compare to the array -size rather than SCTP_EVENT_TIMEOUT_MAX. - -Fixes CoverityScan CID#1397639 ("Out-of-bounds read") - -Signed-off-by: Colin Ian King -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - net/sctp/debug.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/sctp/debug.c -+++ b/net/sctp/debug.c -@@ -166,7 +166,7 @@ static const char *const sctp_timer_tbl[ - /* Lookup timer debug name. */ - const char *sctp_tname(const sctp_subtype_t id) - { -- if (id.timeout <= SCTP_EVENT_TIMEOUT_MAX) -+ if (id.timeout < ARRAY_SIZE(sctp_timer_tbl)) - return sctp_timer_tbl[id.timeout]; - return "unknown_timer"; - } diff --git a/queue-4.4/series b/queue-4.4/series index 756dd838180..ac43e5439ce 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -54,7 +54,6 @@ gianfar-do-not-reuse-pages-from-emergency-reserve.patch btrfs-fix-truncate-down-when-no_holes-feature-is-enabled.patch virtio_console-fix-a-crash-in-config_work_handler.patch swiotlb-xen-update-dev_addr-after-swapping-pages.patch -net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch xen-netfront-fix-rx-stall-during-network-stress-and-oom.patch scsi-virtio_scsi-reject-commands-when-virtqueue-is-broken.patch platform-x86-ideapad-laptop-handle-acpi-event-1.patch diff --git a/queue-4.9/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch b/queue-4.9/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch deleted file mode 100644 index 88bd2c9f417..00000000000 --- a/queue-4.9/net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From foo@baz Mon Jul 3 13:09:02 CEST 2017 -From: Colin Ian King -Date: Fri, 20 Jan 2017 13:01:57 +0000 -Subject: net: sctp: fix array overrun read on sctp_timer_tbl - -From: Colin Ian King - - -[ Upstream commit 0e73fc9a56f22f2eec4d2b2910c649f7af67b74d ] - -The comparison on the timeout can lead to an array overrun -read on sctp_timer_tbl because of an off-by-one error. Fix -this by using < instead of <= and also compare to the array -size rather than SCTP_EVENT_TIMEOUT_MAX. - -Fixes CoverityScan CID#1397639 ("Out-of-bounds read") - -Signed-off-by: Colin Ian King -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - net/sctp/debug.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/sctp/debug.c -+++ b/net/sctp/debug.c -@@ -166,7 +166,7 @@ static const char *const sctp_timer_tbl[ - /* Lookup timer debug name. */ - const char *sctp_tname(const sctp_subtype_t id) - { -- if (id.timeout <= SCTP_EVENT_TIMEOUT_MAX) -+ if (id.timeout < ARRAY_SIZE(sctp_timer_tbl)) - return sctp_timer_tbl[id.timeout]; - return "unknown_timer"; - } diff --git a/queue-4.9/series b/queue-4.9/series index 5aca3c4cd00..fedd0b4583a 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -81,7 +81,6 @@ btrfs-fix-deadlock-between-direct-io-and-fast-fsync.patch btrfs-fix-truncate-down-when-no_holes-feature-is-enabled.patch virtio_console-fix-a-crash-in-config_work_handler.patch swiotlb-xen-update-dev_addr-after-swapping-pages.patch -net-sctp-fix-array-overrun-read-on-sctp_timer_tbl.patch xen-netfront-fix-rx-stall-during-network-stress-and-oom.patch scsi-virtio_scsi-reject-commands-when-virtqueue-is-broken.patch iwlwifi-fix-kernel-crash-when-unregistering-thermal-zone.patch