drop broken stm patch

diff --git a/queue-4.14/series b/queue-4.14/series
index 68c2dfbd40b90ecd2c7499893e32bb494039bc2f..925deadea3fab11357666b08f3c8c1e60b4036d6 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -13,7 +13,6 @@ parisc-skip-registering-led-when-running-in-qemu.patch
 parisc-use-pa_asm_level-in-boot-code.patch
 parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
 stm-class-fix-channel-free-in-stm-output-free-path.patch
-stm-class-fix-channel-bitmap-on-32-bit-systems.patch
 md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch
 intel_th-msu-fix-single-mode-with-iommu.patch
 p54-drop-device-reference-count-if-fails-to-enable-device.patch

diff --git a/queue-4.14/stm-class-fix-channel-bitmap-on-32-bit-systems.patch b/queue-4.14/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
deleted file mode 100644 (file)
index 69b4610..0000000
--- a/queue-4.14/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 51e0f227812ed81a368de54157ebe14396b4be03 Mon Sep 17 00:00:00 2001
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Date: Wed, 17 Apr 2019 10:35:35 +0300
-Subject: stm class: Fix channel bitmap on 32-bit systems
-
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-
-commit 51e0f227812ed81a368de54157ebe14396b4be03 upstream.
-
-Commit 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace
-Module devices") naively calculates the channel bitmap size in 64-bit
-chunks regardless of the size of underlying unsigned long, making the
-bitmap half as big on a 32-bit system. This leads to an out of bounds
-access with the upper half of the bitmap.
-
-Fix this by using BITS_TO_LONGS. While at it, convert to using
-struct_size() for the total size calculation of the master struct.
-
-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
-Reported-by: Mulu He <muluhe@codeaurora.org>
-Cc: stable@vger.kernel.org # v4.4+
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwtracing/stm/core.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/hwtracing/stm/core.c
-+++ b/drivers/hwtracing/stm/core.c
-@@ -174,11 +174,10 @@ stm_master(struct stm_device *stm, unsig
- static int stp_master_alloc(struct stm_device *stm, unsigned int idx)
- {
-       struct stp_master *master;
--      size_t size;
- 
--      size = ALIGN(stm->data->sw_nchannels, 8) / 8;
--      size += sizeof(struct stp_master);
--      master = kzalloc(size, GFP_ATOMIC);
-+      master = kzalloc(struct_size(master, chan_map,
-+                                   BITS_TO_LONGS(stm->data->sw_nchannels)),
-+                       GFP_ATOMIC);
-       if (!master)
-               return -ENOMEM;
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index a57b9aaab2b29d5672e478b51dc88b7e10010b82..4882d808a626a714d7c01f7d6a1812d696b44b3e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -36,7 +36,6 @@ tipc-switch-order-of-device-registration-to-fix-a-crash.patch
 tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch
 parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
 stm-class-fix-channel-free-in-stm-output-free-path.patch
-stm-class-fix-channel-bitmap-on-32-bit-systems.patch
 md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch
 intel_th-msu-fix-single-mode-with-iommu.patch
 of-fix-clang-wunsequenced-for-be32_to_cpu.patch

diff --git a/queue-4.4/stm-class-fix-channel-bitmap-on-32-bit-systems.patch b/queue-4.4/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
deleted file mode 100644 (file)
index 78bb795..0000000
--- a/queue-4.4/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 51e0f227812ed81a368de54157ebe14396b4be03 Mon Sep 17 00:00:00 2001
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Date: Wed, 17 Apr 2019 10:35:35 +0300
-Subject: stm class: Fix channel bitmap on 32-bit systems
-
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-
-commit 51e0f227812ed81a368de54157ebe14396b4be03 upstream.
-
-Commit 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace
-Module devices") naively calculates the channel bitmap size in 64-bit
-chunks regardless of the size of underlying unsigned long, making the
-bitmap half as big on a 32-bit system. This leads to an out of bounds
-access with the upper half of the bitmap.
-
-Fix this by using BITS_TO_LONGS. While at it, convert to using
-struct_size() for the total size calculation of the master struct.
-
-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
-Reported-by: Mulu He <muluhe@codeaurora.org>
-Cc: stable@vger.kernel.org # v4.4+
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwtracing/stm/core.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/hwtracing/stm/core.c
-+++ b/drivers/hwtracing/stm/core.c
-@@ -158,11 +158,10 @@ stm_master(struct stm_device *stm, unsig
- static int stp_master_alloc(struct stm_device *stm, unsigned int idx)
- {
-       struct stp_master *master;
--      size_t size;
- 
--      size = ALIGN(stm->data->sw_nchannels, 8) / 8;
--      size += sizeof(struct stp_master);
--      master = kzalloc(size, GFP_ATOMIC);
-+      master = kzalloc(struct_size(master, chan_map,
-+                                   BITS_TO_LONGS(stm->data->sw_nchannels)),
-+                       GFP_ATOMIC);
-       if (!master)
-               return -ENOMEM;
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index dc3dd66bdb1c45fa7bcced15da5bd7ed71cfc8c5..887a9ba2217b854b24f56bda1a033c649a18f790 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -9,7 +9,6 @@ parisc-export-running_on_qemu-symbol-for-modules.patch
 parisc-skip-registering-led-when-running-in-qemu.patch
 parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
 stm-class-fix-channel-free-in-stm-output-free-path.patch
-stm-class-fix-channel-bitmap-on-32-bit-systems.patch
 md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch
 intel_th-msu-fix-single-mode-with-iommu.patch
 p54-drop-device-reference-count-if-fails-to-enable-device.patch

diff --git a/queue-4.9/stm-class-fix-channel-bitmap-on-32-bit-systems.patch b/queue-4.9/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
deleted file mode 100644 (file)
index 69b4610..0000000
--- a/queue-4.9/stm-class-fix-channel-bitmap-on-32-bit-systems.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 51e0f227812ed81a368de54157ebe14396b4be03 Mon Sep 17 00:00:00 2001
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Date: Wed, 17 Apr 2019 10:35:35 +0300
-Subject: stm class: Fix channel bitmap on 32-bit systems
-
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-
-commit 51e0f227812ed81a368de54157ebe14396b4be03 upstream.
-
-Commit 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace
-Module devices") naively calculates the channel bitmap size in 64-bit
-chunks regardless of the size of underlying unsigned long, making the
-bitmap half as big on a 32-bit system. This leads to an out of bounds
-access with the upper half of the bitmap.
-
-Fix this by using BITS_TO_LONGS. While at it, convert to using
-struct_size() for the total size calculation of the master struct.
-
-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
-Reported-by: Mulu He <muluhe@codeaurora.org>
-Cc: stable@vger.kernel.org # v4.4+
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwtracing/stm/core.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/hwtracing/stm/core.c
-+++ b/drivers/hwtracing/stm/core.c
-@@ -174,11 +174,10 @@ stm_master(struct stm_device *stm, unsig
- static int stp_master_alloc(struct stm_device *stm, unsigned int idx)
- {
-       struct stp_master *master;
--      size_t size;
- 
--      size = ALIGN(stm->data->sw_nchannels, 8) / 8;
--      size += sizeof(struct stp_master);
--      master = kzalloc(size, GFP_ATOMIC);
-+      master = kzalloc(struct_size(master, chan_map,
-+                                   BITS_TO_LONGS(stm->data->sw_nchannels)),
-+                       GFP_ATOMIC);
-       if (!master)
-               return -ENOMEM;
-