From: Jakub Kicinski Date: Wed, 27 Jul 2022 02:53:09 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.6-pxa1908~3374^2~11 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e77ea97d2bd99b004e96c339ee22408c5475a52e;p=linux.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf Florian Westphal says: ==================== netfilter updates for net Three late fixes for netfilter: 1) If nf_queue user requests packet truncation below size of l3 header, we corrupt the skb, then crash. Reject such requests. 2) add cond_resched() calls when doing cycle detection in the nf_tables graph. This avoids softlockup warning with certain rulesets. 3) Reject rulesets that use nftables 'queue' expression in family/chain combinations other than those that are supported. Currently the ruleset will load, but when userspace attempts to reinject you get WARN splat + packet drops. * git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: netfilter: nft_queue: only allow supported familes and hooks netfilter: nf_tables: add rescheduling points during loop detection walks netfilter: nf_queue: do not allow packet truncation below transport header offset ==================== Link: https://lore.kernel.org/r/20220726192056.13497-1-fw@strlen.de Signed-off-by: Jakub Kicinski --- e77ea97d2bd99b004e96c339ee22408c5475a52e