]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some 4.14 and 4.19 patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jan 2021 08:50:23 +0000 (09:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jan 2021 08:50:23 +0000 (09:50 +0100)
queue-4.14/dm-integrity-select-crypto_skcipher.patch [deleted file]
queue-4.14/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch [deleted file]
queue-4.14/series
queue-4.19/dm-integrity-select-crypto_skcipher.patch [deleted file]
queue-4.19/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch [deleted file]
queue-4.19/series

diff --git a/queue-4.14/dm-integrity-select-crypto_skcipher.patch b/queue-4.14/dm-integrity-select-crypto_skcipher.patch
deleted file mode 100644 (file)
index c3e2ca8..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From bf13e86dbee060f4d5addb522df66b4aad8eee66 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Dec 2020 18:18:11 +0100
-Subject: dm integrity: select CRYPTO_SKCIPHER
-
-From: Anthony Iliopoulos <ailiop@suse.com>
-
-[ Upstream commit f7b347acb5f6c29d9229bb64893d8b6a2c7949fb ]
-
-The integrity target relies on skcipher for encryption/decryption, but
-certain kernel configurations may not enable CRYPTO_SKCIPHER, leading to
-compilation errors due to unresolved symbols. Explicitly select
-CRYPTO_SKCIPHER for DM_INTEGRITY, since it is unconditionally dependent
-on it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/md/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
-index 4a249ee86364c..231b6a18ca272 100644
---- a/drivers/md/Kconfig
-+++ b/drivers/md/Kconfig
-@@ -508,6 +508,7 @@ config DM_INTEGRITY
-       select BLK_DEV_INTEGRITY
-       select DM_BUFIO
-       select CRYPTO
-+      select CRYPTO_SKCIPHER
-       select ASYNC_XOR
-       ---help---
-         This device-mapper target emulates a block device that has
--- 
-2.27.0
-
diff --git a/queue-4.14/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch b/queue-4.14/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch
deleted file mode 100644 (file)
index e2ddde1..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 87fe04367d842c4d97a77303242d4dd4ac351e46 Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Date: Sat, 16 Jan 2021 03:39:35 +0100
-Subject: net: dsa: mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext
-
-From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-
-commit 87fe04367d842c4d97a77303242d4dd4ac351e46 upstream.
-
-mv88e6xxx_port_vlan_join checks whether the VTU already contains an
-entry for the given vid (via mv88e6xxx_vtu_getnext), and if so, merely
-changes the relevant .member[] element and loads the updated entry
-into the VTU.
-
-However, at least for the mv88e6250, the on-stack struct
-mv88e6xxx_vtu_entry vlan never has its .state[] array explicitly
-initialized, neither in mv88e6xxx_port_vlan_join() nor inside the
-getnext implementation. So the new entry has random garbage for the
-STU bits, breaking VLAN filtering.
-
-When the VTU entry is initially created, those bits are all zero, and
-we should make sure to keep them that way when the entry is updated.
-
-Fixes: 92307069a96c (net: dsa: mv88e6xxx: Avoid VTU corruption on 6097)
-Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Reviewed-by: Tobias Waldekranz <tobias@waldekranz.com>
-Tested-by: Tobias Waldekranz <tobias@waldekranz.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/dsa/mv88e6xxx/global1_vtu.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
-+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
-@@ -354,6 +354,10 @@ int mv88e6185_g1_vtu_getnext(struct mv88
-               if (err)
-                       return err;
-+              err = mv88e6185_g1_stu_data_read(chip, entry);
-+              if (err)
-+                      return err;
-+
-               /* VTU DBNum[3:0] are located in VTU Operation 3:0
-                * VTU DBNum[7:4] are located in VTU Operation 11:8
-                */
index 1233b6d37e246370c842e06f1d5d751fe27bcb0d..964ea873735e7c84b2638f384a23abbc060b46a9 100644 (file)
@@ -6,7 +6,6 @@ mmc-sdhci-xenon-fix-1.8v-regulator-stabilization.patch
 dm-avoid-filesystem-lookup-in-dm_get_dev_t.patch
 drm-atomic-put-state-on-error-path.patch
 asoc-intel-haswell-add-missing-pm_ops.patch
-dm-integrity-select-crypto_skcipher.patch
 scsi-ufs-correct-the-lun-used-in-eh_device_reset_han.patch
 xen-fix-event-channel-callback-via-intx-gsi.patch
 drm-nouveau-bios-fix-issue-shadowing-expansion-roms.patch
@@ -28,7 +27,6 @@ xhci-tegra-delay-for-disabling-lfps-detector.patch
 compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch
 netfilter-rpfilter-mask-ecn-bits-before-fib-lookup.patch
 sh-dma-fix-kconfig-dependency-for-g2_dma.patch
-net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch
 sh_eth-fix-power-down-vs.-is_opened-flag-ordering.patch
 skbuff-back-tiny-skbs-with-kmalloc-in-__netdev_alloc_skb-too.patch
 udp-mask-tos-bits-in-udp_v4_early_demux.patch
diff --git a/queue-4.19/dm-integrity-select-crypto_skcipher.patch b/queue-4.19/dm-integrity-select-crypto_skcipher.patch
deleted file mode 100644 (file)
index 4f0325c..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 38125b15ecaac034e17b869c9180683fbd8b1a64 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Dec 2020 18:18:11 +0100
-Subject: dm integrity: select CRYPTO_SKCIPHER
-
-From: Anthony Iliopoulos <ailiop@suse.com>
-
-[ Upstream commit f7b347acb5f6c29d9229bb64893d8b6a2c7949fb ]
-
-The integrity target relies on skcipher for encryption/decryption, but
-certain kernel configurations may not enable CRYPTO_SKCIPHER, leading to
-compilation errors due to unresolved symbols. Explicitly select
-CRYPTO_SKCIPHER for DM_INTEGRITY, since it is unconditionally dependent
-on it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/md/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
-index 8b8c123cae66f..7d61ef03cb187 100644
---- a/drivers/md/Kconfig
-+++ b/drivers/md/Kconfig
-@@ -527,6 +527,7 @@ config DM_INTEGRITY
-       select BLK_DEV_INTEGRITY
-       select DM_BUFIO
-       select CRYPTO
-+      select CRYPTO_SKCIPHER
-       select ASYNC_XOR
-       ---help---
-         This device-mapper target emulates a block device that has
--- 
-2.27.0
-
diff --git a/queue-4.19/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch b/queue-4.19/net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch
deleted file mode 100644 (file)
index f5710dd..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 87fe04367d842c4d97a77303242d4dd4ac351e46 Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Date: Sat, 16 Jan 2021 03:39:35 +0100
-Subject: net: dsa: mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext
-
-From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-
-commit 87fe04367d842c4d97a77303242d4dd4ac351e46 upstream.
-
-mv88e6xxx_port_vlan_join checks whether the VTU already contains an
-entry for the given vid (via mv88e6xxx_vtu_getnext), and if so, merely
-changes the relevant .member[] element and loads the updated entry
-into the VTU.
-
-However, at least for the mv88e6250, the on-stack struct
-mv88e6xxx_vtu_entry vlan never has its .state[] array explicitly
-initialized, neither in mv88e6xxx_port_vlan_join() nor inside the
-getnext implementation. So the new entry has random garbage for the
-STU bits, breaking VLAN filtering.
-
-When the VTU entry is initially created, those bits are all zero, and
-we should make sure to keep them that way when the entry is updated.
-
-Fixes: 92307069a96c (net: dsa: mv88e6xxx: Avoid VTU corruption on 6097)
-Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Reviewed-by: Tobias Waldekranz <tobias@waldekranz.com>
-Tested-by: Tobias Waldekranz <tobias@waldekranz.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/dsa/mv88e6xxx/global1_vtu.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
-+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
-@@ -357,6 +357,10 @@ int mv88e6185_g1_vtu_getnext(struct mv88
-               if (err)
-                       return err;
-+              err = mv88e6185_g1_stu_data_read(chip, entry);
-+              if (err)
-+                      return err;
-+
-               /* VTU DBNum[3:0] are located in VTU Operation 3:0
-                * VTU DBNum[7:4] are located in VTU Operation 11:8
-                */
index ba1d1001755eb4574668e00377889d07b142720e..ab5205b6857e782f19e29658e3b08fb99d44aebe 100644 (file)
@@ -9,7 +9,6 @@ dm-avoid-filesystem-lookup-in-dm_get_dev_t.patch
 dm-integrity-fix-a-crash-if-recalculate-used-without-internal_hash.patch
 drm-atomic-put-state-on-error-path.patch
 asoc-intel-haswell-add-missing-pm_ops.patch
-dm-integrity-select-crypto_skcipher.patch
 scsi-ufs-correct-the-lun-used-in-eh_device_reset_han.patch
 scsi-qedi-correct-max-length-of-chap-secret.patch
 riscv-fix-kernel-time_init.patch
@@ -43,7 +42,6 @@ xhci-tegra-delay-for-disabling-lfps-detector.patch
 driver-core-extend-device_is_dependent.patch
 netfilter-rpfilter-mask-ecn-bits-before-fib-lookup.patch
 sh-dma-fix-kconfig-dependency-for-g2_dma.patch
-net-dsa-mv88e6xxx-also-read-stu-state-in-mv88e6250_g1_vtu_getnext.patch
 sh_eth-fix-power-down-vs.-is_opened-flag-ordering.patch
 skbuff-back-tiny-skbs-with-kmalloc-in-__netdev_alloc_skb-too.patch
 kasan-fix-unaligned-address-is-unhandled-in-kasan_remove_zero_shadow.patch