Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2025

Conversation

bmastbergen
Copy link
Collaborator

jira VULN-6811
cve CVE-2023-6817

commit-author Florian Westphal <[email protected]>
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 <[email protected]>
Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
	Signed-off-by: Florian Westphal <[email protected]>
	Signed-off-by: Pablo Neira Ayuso <[email protected]>
(cherry picked from commit 317eb9685095678f2c9f5a8189de698c5354316a)
	Signed-off-by: Brett Mastbergen <[email protected]>

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 <[email protected]>
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 <[email protected]>
Fixes: 3c4287f ("nf_tables: Add set type for arbitrary concatenation of ranges")
	Signed-off-by: Florian Westphal <[email protected]>
	Signed-off-by: Pablo Neira Ayuso <[email protected]>
(cherry picked from commit 317eb96)
	Signed-off-by: Brett Mastbergen <[email protected]>
Copy link

@gvrose8192 gvrose8192 left a comment

Choose a reason for hiding this comment

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

LGTM - Thanks!

Copy link
Collaborator

@PlaidCat PlaidCat left a comment

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-rt Feb 6, 2025
3 checks passed
@bmastbergen bmastbergen deleted the bmastbergen_ciqlts9_2-rt/VULN-6811 branch February 6, 2025 20:08
Sign up for free to 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