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 (file)
index 98e138c..0000000
--- 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 <colin.king@canonical.com>
-Date: Fri, 20 Jan 2017 13:01:57 +0000
-Subject: net: sctp: fix array overrun read on sctp_timer_tbl
-
-From: Colin Ian King <colin.king@canonical.com>
-
-
-[ 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 <colin.king@canonical.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 756dd838180f35e2bfe289b98eb764a1d7f0f574..ac43e5439ce474d7d00da2629731d3034516d340 100644 (file)
--- 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 (file)
index 88bd2c9..0000000
--- 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 <colin.king@canonical.com>
-Date: Fri, 20 Jan 2017 13:01:57 +0000
-Subject: net: sctp: fix array overrun read on sctp_timer_tbl
-
-From: Colin Ian King <colin.king@canonical.com>
-
-
-[ 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 <colin.king@canonical.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 5aca3c4cd00083d977932949784b71b1240b9fac..fedd0b4583a8d160a0e149faf34b19271122f841 100644 (file)
--- 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