Skip to content

netfilter: nft_set_pipapo: skip inactive elements during set walk - #105

Merged
bmastbergen merged 1 commit into
ciqlts9_2-rtfrom
bmastbergen_ciqlts9_2-rt/VULN-6811
Feb 6, 2025
Merged

netfilter: nft_set_pipapo: skip inactive elements during set walk#105
bmastbergen merged 1 commit into
ciqlts9_2-rtfrom
bmastbergen_ciqlts9_2-rt/VULN-6811

Conversation

@bmastbergen

Copy link
Copy Markdown
Collaborator

jira VULN-6811
cve CVE-2023-6817

commit-author Florian Westphal <fw@strlen.de>
commit 317eb9685095678f2c9f5a8189de698c5354316a
upstream-diff Additional newline because this kernel has not removed
the nft_set_elem_expired call yet
Otherwise set elements can be deactivated twice which will cause a crash.
Reported-by: Xingyuan Mo <hdthky0@gmail.com>
Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 317eb9685095678f2c9f5a8189de698c5354316a)
Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>

Same as #102

build.log

Netfilter selftests were run because this is a netfilter change:
netfilter-selftest-before.log
netfilter-selftest-after.log

brett@lycia ~/ciq/vuln-6811 % grep ^ok netfilter-selftest-before.log | wc -l
15
brett@lycia ~/ciq/vuln-6811 % grep ^ok netfilter-selftest-after.log | wc -l
15
brett@lycia ~/ciq/vuln-6811 %

Full selftests were also run:
selftests-before.log
selftests-after.log

Fewer passes after, but nothing of concern

brett@lycia ~/ciq/vuln-6811 % grep ^ok selftests-before.log | wc -l
311
brett@lycia ~/ciq/vuln-6811 % grep ^ok selftests-after.log | wc -l
305
brett@lycia ~/ciq/vuln-6811 %

jira VULN-6811
cve CVE-2023-6817
commit-author Florian Westphal <fw@strlen.de>
commit 317eb96
upstream-diff Additional newline because this kernel has not removed
the nft_set_elem_expired call yet
Otherwise set elements can be deactivated twice which will cause a crash.
Reported-by: Xingyuan Mo <hdthky0@gmail.com>
Fixes: 3c4287f ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 317eb96)
Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>

@gvrose8192gvrose8192 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Thanks!

@PlaidCatPlaidCat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@bmastbergen
bmastbergen merged commit 1e4f620 into ciqlts9_2-rtFeb 6, 2025
@bmastbergen
bmastbergen deleted the bmastbergen_ciqlts9_2-rt/VULN-6811 branch February 6, 2025 20:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@bmastbergen@gvrose8192@PlaidCat