From c75ae066e7a1eb8e63cd8cb82a45bcefd7fb186c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 11 Jun 2024 15:35:19 +0200 Subject: [PATCH] 6.9-stable patches added patches: selftests-net-lib-set-i-as-local.patch --- .../selftests-net-lib-set-i-as-local.patch | 43 +++++++++++++++++++ queue-6.9/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-6.9/selftests-net-lib-set-i-as-local.patch diff --git a/queue-6.9/selftests-net-lib-set-i-as-local.patch b/queue-6.9/selftests-net-lib-set-i-as-local.patch new file mode 100644 index 00000000000..3be658fa572 --- /dev/null +++ b/queue-6.9/selftests-net-lib-set-i-as-local.patch @@ -0,0 +1,43 @@ +From 84a8bc3ec225b28067b168e9410e452c83d706da Mon Sep 17 00:00:00 2001 +From: "Matthieu Baerts (NGI0)" +Date: Wed, 5 Jun 2024 11:21:18 +0200 +Subject: selftests: net: lib: set 'i' as local + +From: Matthieu Baerts (NGI0) + +commit 84a8bc3ec225b28067b168e9410e452c83d706da upstream. + +Without this, the 'i' variable declared before could be overridden by +accident, e.g. + + for i in "${@}"; do + __ksft_status_merge "${i}" ## 'i' has been modified + foo "${i}" ## using 'i' with an unexpected value + done + +After a quick look, it looks like 'i' is currently not used after having +been modified in __ksft_status_merge(), but still, better be safe than +sorry. I saw this while modifying the same file, not because I suspected +an issue somewhere. + +Fixes: 596c8819cb78 ("selftests: forwarding: Have RET track kselftest framework constants") +Acked-by: Geliang Tang +Signed-off-by: Matthieu Baerts (NGI0) +Reviewed-by: Hangbin Liu +Link: https://lore.kernel.org/r/20240605-upstream-net-20240605-selftests-net-lib-fixes-v1-3-b3afadd368c9@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/lib.sh | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/testing/selftests/net/lib.sh ++++ b/tools/testing/selftests/net/lib.sh +@@ -22,6 +22,7 @@ __ksft_status_merge() + local -A weights + local weight=0 + ++ local i + for i in "$@"; do + weights[$i]=$((weight++)) + done diff --git a/queue-6.9/series b/queue-6.9/series index 9e2527f2e0d..254016daa66 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -277,6 +277,7 @@ cifs-fix-missing-set-of-remote_i_size.patch tracing-probes-fix-error-check-in-parse_btf_field.patch tpm_tis_spi-account-for-spi-header-when-allocating-t.patch sunrpc-fix-loop-termination-condition-in-gss_free_in_token_pages.patch +selftests-net-lib-set-i-as-local.patch netfilter-nfnetlink_queue-acquire-rcu_read_lock-in-i.patch netfilter-ipset-add-list-flush-to-cancel_gc.patch netfilter-nft_payload-restore-vlan-q-in-q-match-supp.patch -- 2.47.3