History

Merge tag 'nf-24-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Fix incorrect documentation in uapi/linux/netfilter/nf_tables.h regarding flowtable hooks, from Phil Sutter. 2) Fix nft_audit.sh selftests with newer nft binaries, due to different (valid) audit output, also from Phil. 3) Disable BH when duplicating packets via nf_dup infrastructure, otherwise race on nf_skb_duplicated for locally generated traffic. From Eric. 4) Missing return in callback of selftest C program, from zhang jiao. netfilter pull request 24-10-02 * tag 'nf-24-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: selftests: netfilter: Add missing return value netfilter: nf_tables: prevent nf_skb_duplicated corruption selftests: netfilter: Fix nft_audit.sh for newer nft binaries netfilter: uapi: NFTA_FLOWTABLE_HOOK is NLA_NESTED ====================

Paolo Abeni committed 2 years ago

Commit 1127c732 parents a0ffa68 10dbd235 files · +41 −33Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+1−1
@@ -1694,7 +1694,7 @@ enum nft_flowtable_flags { · 1693 unmodified lines
16941694 *
16951695 * @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
16961696 * @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
1697− * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
1697+ * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
16981698 * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
16991699 * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
17001700 * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)