From: Greg Kroah-Hartman Date: Tue, 11 Nov 2025 00:43:02 +0000 (+0900) Subject: 5.15-stable patches X-Git-Tag: v6.12.58~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33c0ca9766f0dd6e3f69015d415af977628baeb5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch selftests-netdevsim-set-test-timeout-to-10-minutes.patch --- diff --git a/queue-5.15/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch b/queue-5.15/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch new file mode 100644 index 0000000000..d5e0ea2cfb --- /dev/null +++ b/queue-5.15/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch @@ -0,0 +1,36 @@ +From 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Fri, 9 May 2025 09:17:04 +0200 +Subject: extcon: adc-jack: Cleanup wakeup source only if it was enabled + +From: Krzysztof Kozlowski + +commit 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f upstream. + +Driver in the probe enables wakeup source conditionally, so the cleanup +path should do the same - do not release the wakeup source memory if it +was not allocated. + +Link: https://lore.kernel.org/lkml/20250509071703.39442-2-krzysztof.kozlowski@linaro.org/ +Reported-by: Christophe JAILLET +Closes: https://lore.kernel.org/r/22aaebb7-553b-4571-8a43-58a523241082@wanadoo.fr/ +Fixes: 78b6a991eb6c ("extcon: adc-jack: Fix wakeup source leaks on device unbind") +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Chanwoo Choi +Signed-off-by: Greg Kroah-Hartman +--- + drivers/extcon/extcon-adc-jack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/extcon/extcon-adc-jack.c ++++ b/drivers/extcon/extcon-adc-jack.c +@@ -162,7 +162,8 @@ static int adc_jack_remove(struct platfo + { + struct adc_jack_data *data = platform_get_drvdata(pdev); + +- device_init_wakeup(&pdev->dev, false); ++ if (data->wakeup_source) ++ device_init_wakeup(&pdev->dev, false); + free_irq(data->irq, data); + cancel_work_sync(&data->handler.work); + diff --git a/queue-5.15/selftests-netdevsim-set-test-timeout-to-10-minutes.patch b/queue-5.15/selftests-netdevsim-set-test-timeout-to-10-minutes.patch new file mode 100644 index 0000000000..2a8166f4ce --- /dev/null +++ b/queue-5.15/selftests-netdevsim-set-test-timeout-to-10-minutes.patch @@ -0,0 +1,32 @@ +From afbf75e8da8ce8a0698212953d350697bb4355a6 Mon Sep 17 00:00:00 2001 +From: Jakub Kicinski +Date: Mon, 25 Mar 2024 08:56:11 -0700 +Subject: selftests: netdevsim: set test timeout to 10 minutes + +From: Jakub Kicinski + +commit afbf75e8da8ce8a0698212953d350697bb4355a6 upstream. + +The longest running netdevsim test, nexthop.sh, currently takes +5 min to finish. Around 260s to be exact, and 310s on a debug kernel. +The default timeout in selftest is 45sec, so we need an explicit +config. Give ourselves some headroom and use 10min. + +Commit under Fixes isn't really to "blame" but prior to that +netdevsim tests weren't integrated with kselftest infra +so blaming the tests themselves doesn't seem right, either. + +Fixes: 8ff25dac88f6 ("netdevsim: add Makefile for selftests") +Signed-off-by: Jakub Kicinski +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/drivers/net/netdevsim/settings | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 tools/testing/selftests/drivers/net/netdevsim/settings + +--- /dev/null ++++ b/tools/testing/selftests/drivers/net/netdevsim/settings +@@ -0,0 +1 @@ ++timeout=600 diff --git a/queue-5.15/series b/queue-5.15/series index ffd3c2a337..ea7d4ea917 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -227,3 +227,5 @@ bnxt_en-fix-a-possible-memory-leak-in-bnxt_ptp_init.patch tracing-fix-memory-leaks-in-create_field_var.patch rtc-rx8025-fix-incorrect-register-reference.patch lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch +extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch +selftests-netdevsim-set-test-timeout-to-10-minutes.patch