From: Sasha Levin Date: Mon, 6 Sep 2021 01:10:41 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v5.10.63~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4483a5b9723095e765759b563a2cdcb92ffe7113;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/cryptoloop-add-a-deprecation-warning.patch b/queue-4.4/cryptoloop-add-a-deprecation-warning.patch new file mode 100644 index 00000000000..f0659225aae --- /dev/null +++ b/queue-4.4/cryptoloop-add-a-deprecation-warning.patch @@ -0,0 +1,62 @@ +From f6a5f3be0b2841f241942ae4445a8ae727ee50f9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Aug 2021 18:32:50 +0200 +Subject: cryptoloop: add a deprecation warning + +From: Christoph Hellwig + +[ Upstream commit 222013f9ac30b9cec44301daa8dbd0aae38abffb ] + +Support for cryptoloop has been officially marked broken and deprecated +in favor of dm-crypt (which supports the same broken algorithms if +needed) in Linux 2.6.4 (released in March 2004), and support for it has +been entirely removed from losetup in util-linux 2.23 (released in April +2013). Add a warning and a deprecation schedule. + +Signed-off-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20210827163250.255325-1-hch@lst.de +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/Kconfig | 4 ++-- + drivers/block/cryptoloop.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig +index c794e215ea3d..324abc8d53fa 100644 +--- a/drivers/block/Kconfig ++++ b/drivers/block/Kconfig +@@ -267,7 +267,7 @@ config BLK_DEV_LOOP_MIN_COUNT + dynamically allocated with the /dev/loop-control interface. + + config BLK_DEV_CRYPTOLOOP +- tristate "Cryptoloop Support" ++ tristate "Cryptoloop Support (DEPRECATED)" + select CRYPTO + select CRYPTO_CBC + depends on BLK_DEV_LOOP +@@ -279,7 +279,7 @@ config BLK_DEV_CRYPTOLOOP + WARNING: This device is not safe for journaled file systems like + ext3 or Reiserfs. Please use the Device Mapper crypto module + instead, which can be configured to be on-disk compatible with the +- cryptoloop device. ++ cryptoloop device. cryptoloop support will be removed in Linux 5.16. + + source "drivers/block/drbd/Kconfig" + +diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c +index 99e773cb70d0..d3d1f24ca7a3 100644 +--- a/drivers/block/cryptoloop.c ++++ b/drivers/block/cryptoloop.c +@@ -201,6 +201,8 @@ init_cryptoloop(void) + + if (rc) + printk(KERN_ERR "cryptoloop: loop_register_transfer failed\n"); ++ else ++ pr_warn("the cryptoloop driver has been deprecated and will be removed in in Linux 5.16\n"); + return rc; + } + +-- +2.30.2 + diff --git a/queue-4.4/qede-fix-memset-corruption.patch b/queue-4.4/qede-fix-memset-corruption.patch new file mode 100644 index 00000000000..b286eb9f69e --- /dev/null +++ b/queue-4.4/qede-fix-memset-corruption.patch @@ -0,0 +1,48 @@ +From 9056653adfe45c39e6087ca98c583e740a9b7e12 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Aug 2021 19:52:49 +0300 +Subject: qede: Fix memset corruption + +From: Shai Malin + +[ Upstream commit e543468869e2532f5d7926e8f417782b48eca3dc ] + +Thanks to Kees Cook who detected the problem of memset that starting +from not the first member, but sized for the whole struct. +The better change will be to remove the redundant memset and to clear +only the msix_cnt member. + +Signed-off-by: Prabhakar Kushwaha +Signed-off-by: Ariel Elior +Signed-off-by: Shai Malin +Reported-by: Kees Cook +Reviewed-by: Kees Cook +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c +index c677b69bbb0b..22c6eaaf3d9f 100644 +--- a/drivers/net/ethernet/qlogic/qede/qede_main.c ++++ b/drivers/net/ethernet/qlogic/qede/qede_main.c +@@ -1918,6 +1918,7 @@ static void qede_sync_free_irqs(struct qede_dev *edev) + } + + edev->int_info.used_cnt = 0; ++ edev->int_info.msix_cnt = 0; + } + + static int qede_req_msix_irqs(struct qede_dev *edev) +@@ -2341,7 +2342,6 @@ static int qede_load(struct qede_dev *edev, enum qede_load_mode mode) + + err4: + qede_sync_free_irqs(edev); +- memset(&edev->int_info.msix_cnt, 0, sizeof(struct qed_int_info)); + err3: + qede_napi_disable_remove(edev); + err2: +-- +2.30.2 + diff --git a/queue-4.4/series b/queue-4.4/series index 878d64d4ef4..feba81939fa 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +1,3 @@ ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch +qede-fix-memset-corruption.patch +cryptoloop-add-a-deprecation-warning.patch