From: Greg Kroah-Hartman Date: Fri, 18 Apr 2025 10:54:30 +0000 (+0200) Subject: drop some broken patches X-Git-Tag: v6.12.24~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6627c9c64886bdf6122d4dc7ba7adf2a6e103644;p=thirdparty%2Fkernel%2Fstable-queue.git drop some broken patches --- diff --git a/queue-5.15/selftests-mptcp-close-fd_in-before-returning-in-main_loop.patch b/queue-5.15/selftests-mptcp-close-fd_in-before-returning-in-main_loop.patch deleted file mode 100644 index 9827f68fe3..0000000000 --- a/queue-5.15/selftests-mptcp-close-fd_in-before-returning-in-main_loop.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c183165f87a486d5879f782c05a23c179c3794ab Mon Sep 17 00:00:00 2001 -From: Geliang Tang -Date: Fri, 28 Mar 2025 15:27:18 +0100 -Subject: selftests: mptcp: close fd_in before returning in main_loop - -From: Geliang Tang - -commit c183165f87a486d5879f782c05a23c179c3794ab upstream. - -The file descriptor 'fd_in' is opened when cfg_input is configured, but -not closed in main_loop(), this patch fixes it. - -Fixes: 05be5e273c84 ("selftests: mptcp: add disconnect tests") -Cc: stable@vger.kernel.org -Co-developed-by: Cong Liu -Signed-off-by: Cong Liu -Signed-off-by: Geliang Tang -Reviewed-by: Matthieu Baerts (NGI0) -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20250328-net-mptcp-misc-fixes-6-15-v1-3-34161a482a7f@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/net/mptcp/mptcp_connect.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/tools/testing/selftests/net/mptcp/mptcp_connect.c -+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c -@@ -734,7 +734,7 @@ static int copyfd_io(int infd, int peerf - } - - if (ret) -- return ret; -+ goto out; - - if (cfg_time) { - unsigned int delta_ms; -@@ -754,7 +754,10 @@ static int copyfd_io(int infd, int peerf - fprintf(stderr, "%d", delta_ms); - } - -- return 0; -+out: -+ if (cfg_input) -+ close(fd_in); -+ return ret; - } - - static void check_sockaddr(int pf, struct sockaddr_storage *ss, diff --git a/queue-5.15/series b/queue-5.15/series index 9b80e27ce3..06a229d421 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -112,7 +112,6 @@ of-irq-fix-device-node-refcount-leakages-in-of_irq_init.patch pci-brcmstb-fix-missing-of_node_put-in-brcm_pcie_probe.patch pci-fix-reference-leak-in-pci_alloc_child_bus.patch pinctrl-qcom-clear-latched-interrupt-status-when-changing-irq-type.patch -selftests-mptcp-close-fd_in-before-returning-in-main_loop.patch arm64-errata-add-newer-arm-cores-to-the-spectre_bhb_loop_affected-lists.patch acpi-platform-profile-fix-cfi-violation-when-accessing-sysfs-files.patch x86-e820-fix-handling-of-subpage-regions-when-calculating-nosave-ranges-in-e820__register_nosave_regions.patch diff --git a/queue-6.12/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.12/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch deleted file mode 100644 index bf086c5b16..0000000000 --- a/queue-6.12/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 Mon Sep 17 00:00:00 2001 -From: Tudor Ambarus -Date: Fri, 17 Jan 2025 14:18:52 +0000 -Subject: scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get - -From: Tudor Ambarus - -commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 upstream. - -The driver leaks the device reference taken with -of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). - -Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API") -Cc: stable@vger.kernel.org -Signed-off-by: Tudor Ambarus -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Abel Vesa -Acked-by: Martin K. Petersen # SCSI -Reviewed-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-3-1ffa5b6884cb@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/ufs/host/ufs-qcom.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/ufs/host/ufs-qcom.c -+++ b/drivers/ufs/host/ufs-qcom.c -@@ -118,7 +118,7 @@ static int ufs_qcom_ice_init(struct ufs_ - struct device *dev = hba->dev; - struct qcom_ice *ice; - -- ice = of_qcom_ice_get(dev); -+ ice = devm_of_qcom_ice_get(dev); - if (ice == ERR_PTR(-EOPNOTSUPP)) { - dev_warn(dev, "Disabling inline encryption support\n"); - ice = NULL; diff --git a/queue-6.12/series b/queue-6.12/series index c458ac7cac..673a5fcfd5 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -343,7 +343,6 @@ kvm-allow-building-irqbypass.ko-as-as-module-when-kvm.ko-is-a-module.patch kvm-ppc-enable-cap_spapr_tce_vfio-on-pseries-kvm-guests.patch kvm-x86-explicitly-zero-initialize-on-stack-cpuid-unions.patch kvm-x86-acquire-srcu-in-kvm_get_mp_state-to-protect-guest-memory-accesses.patch -scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch landlock-move-code-to-ease-future-backports.patch landlock-add-the-errata-interface.patch landlock-add-erratum-for-tcp-fix.patch diff --git a/queue-6.13/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.13/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch deleted file mode 100644 index bf086c5b16..0000000000 --- a/queue-6.13/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 Mon Sep 17 00:00:00 2001 -From: Tudor Ambarus -Date: Fri, 17 Jan 2025 14:18:52 +0000 -Subject: scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get - -From: Tudor Ambarus - -commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 upstream. - -The driver leaks the device reference taken with -of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). - -Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API") -Cc: stable@vger.kernel.org -Signed-off-by: Tudor Ambarus -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Abel Vesa -Acked-by: Martin K. Petersen # SCSI -Reviewed-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-3-1ffa5b6884cb@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/ufs/host/ufs-qcom.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/ufs/host/ufs-qcom.c -+++ b/drivers/ufs/host/ufs-qcom.c -@@ -118,7 +118,7 @@ static int ufs_qcom_ice_init(struct ufs_ - struct device *dev = hba->dev; - struct qcom_ice *ice; - -- ice = of_qcom_ice_get(dev); -+ ice = devm_of_qcom_ice_get(dev); - if (ice == ERR_PTR(-EOPNOTSUPP)) { - dev_warn(dev, "Disabling inline encryption support\n"); - ice = NULL; diff --git a/queue-6.13/series b/queue-6.13/series index 436f98c552..6c5a7b2279 100644 --- a/queue-6.13/series +++ b/queue-6.13/series @@ -365,7 +365,6 @@ kvm-allow-building-irqbypass.ko-as-as-module-when-kvm.ko-is-a-module.patch kvm-ppc-enable-cap_spapr_tce_vfio-on-pseries-kvm-guests.patch kvm-x86-explicitly-zero-initialize-on-stack-cpuid-unions.patch kvm-x86-acquire-srcu-in-kvm_get_mp_state-to-protect-guest-memory-accesses.patch -scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch landlock-move-code-to-ease-future-backports.patch landlock-add-the-errata-interface.patch landlock-add-erratum-for-tcp-fix.patch diff --git a/queue-6.14/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.14/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch deleted file mode 100644 index 9547dad6e8..0000000000 --- a/queue-6.14/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 Mon Sep 17 00:00:00 2001 -From: Tudor Ambarus -Date: Fri, 17 Jan 2025 14:18:52 +0000 -Subject: scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get - -From: Tudor Ambarus - -commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 upstream. - -The driver leaks the device reference taken with -of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). - -Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API") -Cc: stable@vger.kernel.org -Signed-off-by: Tudor Ambarus -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Abel Vesa -Acked-by: Martin K. Petersen # SCSI -Reviewed-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-3-1ffa5b6884cb@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/ufs/host/ufs-qcom.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/ufs/host/ufs-qcom.c -+++ b/drivers/ufs/host/ufs-qcom.c -@@ -125,7 +125,7 @@ static int ufs_qcom_ice_init(struct ufs_ - int err; - int i; - -- ice = of_qcom_ice_get(dev); -+ ice = devm_of_qcom_ice_get(dev); - if (ice == ERR_PTR(-EOPNOTSUPP)) { - dev_warn(dev, "Disabling inline encryption support\n"); - ice = NULL; diff --git a/queue-6.14/series b/queue-6.14/series index d72f76627c..16ef4da492 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -402,7 +402,6 @@ kvm-allow-building-irqbypass.ko-as-as-module-when-kvm.ko-is-a-module.patch kvm-ppc-enable-cap_spapr_tce_vfio-on-pseries-kvm-guests.patch kvm-x86-explicitly-zero-initialize-on-stack-cpuid-unions.patch kvm-x86-acquire-srcu-in-kvm_get_mp_state-to-protect-guest-memory-accesses.patch -scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch landlock-move-code-to-ease-future-backports.patch landlock-add-the-errata-interface.patch landlock-add-erratum-for-tcp-fix.patch diff --git a/queue-6.6/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.6/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch deleted file mode 100644 index 670d6a1056..0000000000 --- a/queue-6.6/scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 Mon Sep 17 00:00:00 2001 -From: Tudor Ambarus -Date: Fri, 17 Jan 2025 14:18:52 +0000 -Subject: scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get - -From: Tudor Ambarus - -commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 upstream. - -The driver leaks the device reference taken with -of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get(). - -Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API") -Cc: stable@vger.kernel.org -Signed-off-by: Tudor Ambarus -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Abel Vesa -Acked-by: Martin K. Petersen # SCSI -Reviewed-by: Manivannan Sadhasivam -Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-3-1ffa5b6884cb@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/ufs/host/ufs-qcom.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/ufs/host/ufs-qcom.c -+++ b/drivers/ufs/host/ufs-qcom.c -@@ -121,7 +121,7 @@ static int ufs_qcom_ice_init(struct ufs_ - struct device *dev = hba->dev; - struct qcom_ice *ice; - -- ice = of_qcom_ice_get(dev); -+ ice = devm_of_qcom_ice_get(dev); - if (ice == ERR_PTR(-EOPNOTSUPP)) { - dev_warn(dev, "Disabling inline encryption support\n"); - ice = NULL; diff --git a/queue-6.6/series b/queue-6.6/series index e9b7ce8e82..7fb83695cd 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -217,7 +217,6 @@ gpio-zynq-fix-wakeup-source-leaks-on-device-unbind.patch gve-handle-overflow-when-reporting-tx-consumed-descriptors.patch kvm-x86-explicitly-zero-initialize-on-stack-cpuid-unions.patch kvm-x86-acquire-srcu-in-kvm_get_mp_state-to-protect-guest-memory-accesses.patch -scsi-ufs-qcom-fix-dev-reference-leaked-through-of_qcom_ice_get.patch ntb-use-64-bit-arithmetic-for-the-msi-doorbell-mask.patch of-irq-fix-device-node-refcount-leakage-in-api-of_irq_parse_one.patch of-irq-fix-device-node-refcount-leakage-in-api-of_irq_parse_raw.patch