From 6c398d71d3ac1d0bead0496cb155c598e26aab73 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Apr 2025 19:10:56 +0200 Subject: [PATCH] drop some patches --- ...set-hwrng-quality-to-lowest-possible.patch | 45 ------------- queue-5.10/series | 1 - ...set-hwrng-quality-to-lowest-possible.patch | 45 ------------- queue-5.15/series | 2 - ...eturned-by-xdp_convert_buff_to_frame.patch | 65 ------------------- ...set-hwrng-quality-to-lowest-possible.patch | 45 ------------- queue-5.4/series | 1 - ...set-hwrng-quality-to-lowest-possible.patch | 45 ------------- queue-6.1/series | 1 - 9 files changed, 250 deletions(-) delete mode 100644 queue-5.10/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch delete mode 100644 queue-5.15/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch delete mode 100644 queue-5.15/xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch delete mode 100644 queue-5.4/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch delete mode 100644 queue-6.1/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch diff --git a/queue-5.10/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch b/queue-5.10/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch deleted file mode 100644 index c6ad2e5b57..0000000000 --- a/queue-5.10/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8006aff15516a170640239c5a8e6696c0ba18d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= -Date: Tue, 22 Apr 2025 11:57:18 +0200 -Subject: crypto: atmel-sha204a - Set hwrng quality to lowest possible -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream. - -According to the review by Bill Cox [1], the Atmel SHA204A random number -generator produces random numbers with very low entropy. - -Set the lowest possible entropy for this chip just to be safe. - -[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html - -Fixes: da001fb651b00e1d ("crypto: atmel-i2c - add support for SHA204A random number generator") -Cc: -Signed-off-by: Marek Behún -Acked-by: Ard Biesheuvel -Reviewed-by: Linus Walleij -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman ---- - drivers/crypto/atmel-sha204a.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/crypto/atmel-sha204a.c -+++ b/drivers/crypto/atmel-sha204a.c -@@ -109,6 +109,12 @@ static int atmel_sha204a_probe(struct i2 - i2c_priv->hwrng.read = atmel_sha204a_rng_read; - i2c_priv->hwrng.quality = 1024; - -+ /* -+ * According to review by Bill Cox [1], this HWRNG has very low entropy. -+ * [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -+ */ -+ i2c_priv->hwrng.quality = 1; -+ - ret = devm_hwrng_register(&client->dev, &i2c_priv->hwrng); - if (ret) - dev_warn(&client->dev, "failed to register RNG (%d)\n", ret); diff --git a/queue-5.10/series b/queue-5.10/series index 557567f5aa..fcb79989e6 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -241,7 +241,6 @@ net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch -crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch kvm-svm-allocate-ir-data-using-atomic-allocation.patch mcb-fix-a-double-free-bug-in-chameleon_parse_gdd.patch usb-storage-quirk-for-adata-portable-hdd-ch94.patch diff --git a/queue-5.15/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch b/queue-5.15/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch deleted file mode 100644 index c6ad2e5b57..0000000000 --- a/queue-5.15/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8006aff15516a170640239c5a8e6696c0ba18d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= -Date: Tue, 22 Apr 2025 11:57:18 +0200 -Subject: crypto: atmel-sha204a - Set hwrng quality to lowest possible -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream. - -According to the review by Bill Cox [1], the Atmel SHA204A random number -generator produces random numbers with very low entropy. - -Set the lowest possible entropy for this chip just to be safe. - -[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html - -Fixes: da001fb651b00e1d ("crypto: atmel-i2c - add support for SHA204A random number generator") -Cc: -Signed-off-by: Marek Behún -Acked-by: Ard Biesheuvel -Reviewed-by: Linus Walleij -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman ---- - drivers/crypto/atmel-sha204a.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/crypto/atmel-sha204a.c -+++ b/drivers/crypto/atmel-sha204a.c -@@ -109,6 +109,12 @@ static int atmel_sha204a_probe(struct i2 - i2c_priv->hwrng.read = atmel_sha204a_rng_read; - i2c_priv->hwrng.quality = 1024; - -+ /* -+ * According to review by Bill Cox [1], this HWRNG has very low entropy. -+ * [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -+ */ -+ i2c_priv->hwrng.quality = 1; -+ - ret = devm_hwrng_register(&client->dev, &i2c_priv->hwrng); - if (ret) - dev_warn(&client->dev, "failed to register RNG (%d)\n", ret); diff --git a/queue-5.15/series b/queue-5.15/series index 38b8219dbb..a47fe3eb09 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -295,8 +295,6 @@ net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch riscv-uprobes-add-missing-fence.i-after-building-the.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch -crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch -xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch drm-amd-display-fix-gpu-reset-in-multidisplay-config.patch diff --git a/queue-5.15/xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch b/queue-5.15/xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch deleted file mode 100644 index 078870435d..0000000000 --- a/queue-5.15/xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch +++ /dev/null @@ -1,65 +0,0 @@ -From cc3628dcd851ddd8d418bf0c897024b4621ddc92 Mon Sep 17 00:00:00 2001 -From: Alexey Nepomnyashih -Date: Thu, 17 Apr 2025 12:21:17 +0000 -Subject: xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() - -From: Alexey Nepomnyashih - -commit cc3628dcd851ddd8d418bf0c897024b4621ddc92 upstream. - -The function xdp_convert_buff_to_frame() may return NULL if it fails -to correctly convert the XDP buffer into an XDP frame due to memory -constraints, internal errors, or invalid data. Failing to check for NULL -may lead to a NULL pointer dereference if the result is used later in -processing, potentially causing crashes, data corruption, or undefined -behavior. - -On XDP redirect failure, the associated page must be released explicitly -if it was previously retained via get_page(). Failing to do so may result -in a memory leak, as the pages reference count is not decremented. - -Cc: stable@vger.kernel.org # v5.9+ -Fixes: 6c5aa6fc4def ("xen networking: add basic XDP support for xen-netfront") -Signed-off-by: Alexey Nepomnyashih -Link: https://patch.msgid.link/20250417122118.1009824-1-sdl@nppct.ru -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/xen-netfront.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - ---- a/drivers/net/xen-netfront.c -+++ b/drivers/net/xen-netfront.c -@@ -987,20 +987,27 @@ static u32 xennet_run_xdp(struct netfron - act = bpf_prog_run_xdp(prog, xdp); - switch (act) { - case XDP_TX: -- get_page(pdata); - xdpf = xdp_convert_buff_to_frame(xdp); -+ if (unlikely(!xdpf)) { -+ trace_xdp_exception(queue->info->netdev, prog, act); -+ break; -+ } -+ get_page(pdata); - err = xennet_xdp_xmit(queue->info->netdev, 1, &xdpf, 0); -- if (unlikely(!err)) -+ if (unlikely(err <= 0)) { -+ if (err < 0) -+ trace_xdp_exception(queue->info->netdev, prog, act); - xdp_return_frame_rx_napi(xdpf); -- else if (unlikely(err < 0)) -- trace_xdp_exception(queue->info->netdev, prog, act); -+ } - break; - case XDP_REDIRECT: - get_page(pdata); - err = xdp_do_redirect(queue->info->netdev, xdp, prog); - *need_xdp_flush = true; -- if (unlikely(err)) -+ if (unlikely(err)) { - trace_xdp_exception(queue->info->netdev, prog, act); -+ xdp_return_buff(xdp); -+ } - break; - case XDP_PASS: - case XDP_DROP: diff --git a/queue-5.4/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch b/queue-5.4/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch deleted file mode 100644 index c6ad2e5b57..0000000000 --- a/queue-5.4/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8006aff15516a170640239c5a8e6696c0ba18d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= -Date: Tue, 22 Apr 2025 11:57:18 +0200 -Subject: crypto: atmel-sha204a - Set hwrng quality to lowest possible -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream. - -According to the review by Bill Cox [1], the Atmel SHA204A random number -generator produces random numbers with very low entropy. - -Set the lowest possible entropy for this chip just to be safe. - -[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html - -Fixes: da001fb651b00e1d ("crypto: atmel-i2c - add support for SHA204A random number generator") -Cc: -Signed-off-by: Marek Behún -Acked-by: Ard Biesheuvel -Reviewed-by: Linus Walleij -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman ---- - drivers/crypto/atmel-sha204a.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/crypto/atmel-sha204a.c -+++ b/drivers/crypto/atmel-sha204a.c -@@ -109,6 +109,12 @@ static int atmel_sha204a_probe(struct i2 - i2c_priv->hwrng.read = atmel_sha204a_rng_read; - i2c_priv->hwrng.quality = 1024; - -+ /* -+ * According to review by Bill Cox [1], this HWRNG has very low entropy. -+ * [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -+ */ -+ i2c_priv->hwrng.quality = 1; -+ - ret = devm_hwrng_register(&client->dev, &i2c_priv->hwrng); - if (ret) - dev_warn(&client->dev, "failed to register RNG (%d)\n", ret); diff --git a/queue-5.4/series b/queue-5.4/series index ff11b2cbaa..ec2bf02ce3 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -144,6 +144,5 @@ tipc-fix-null-pointer-dereference-in-tipc_mon_reinit.patch net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch -crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch mcb-fix-a-double-free-bug-in-chameleon_parse_gdd.patch usb-storage-quirk-for-adata-portable-hdd-ch94.patch diff --git a/queue-6.1/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch b/queue-6.1/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch deleted file mode 100644 index c6ad2e5b57..0000000000 --- a/queue-6.1/crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8006aff15516a170640239c5a8e6696c0ba18d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Beh=C3=BAn?= -Date: Tue, 22 Apr 2025 11:57:18 +0200 -Subject: crypto: atmel-sha204a - Set hwrng quality to lowest possible -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Marek Behún - -commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream. - -According to the review by Bill Cox [1], the Atmel SHA204A random number -generator produces random numbers with very low entropy. - -Set the lowest possible entropy for this chip just to be safe. - -[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html - -Fixes: da001fb651b00e1d ("crypto: atmel-i2c - add support for SHA204A random number generator") -Cc: -Signed-off-by: Marek Behún -Acked-by: Ard Biesheuvel -Reviewed-by: Linus Walleij -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman ---- - drivers/crypto/atmel-sha204a.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/crypto/atmel-sha204a.c -+++ b/drivers/crypto/atmel-sha204a.c -@@ -109,6 +109,12 @@ static int atmel_sha204a_probe(struct i2 - i2c_priv->hwrng.read = atmel_sha204a_rng_read; - i2c_priv->hwrng.quality = 1024; - -+ /* -+ * According to review by Bill Cox [1], this HWRNG has very low entropy. -+ * [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html -+ */ -+ i2c_priv->hwrng.quality = 1; -+ - ret = devm_hwrng_register(&client->dev, &i2c_priv->hwrng); - if (ret) - dev_warn(&client->dev, "failed to register RNG (%d)\n", ret); diff --git a/queue-6.1/series b/queue-6.1/series index bcc855c1c6..314aec41a9 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -60,7 +60,6 @@ loongarch-make-regs_irqs_disabled-more-clear.patch wifi-mac80211-export-ieee80211_purge_tx_queue-for-drivers.patch wifi-rtw88-use-ieee80211_purge_tx_queue-to-purge-tx-skb.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch -crypto-atmel-sha204a-set-hwrng-quality-to-lowest-possible.patch xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch -- 2.47.3