Netfilter updates for net-next
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest13 patches 0 repliesNew
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/13 | netfilter: nfnetlink: add struct nfgenmsg to struct nfnl_info and use itinclude/ net/ net/ +4 more | +42 | 0 replies | |
| 2/13 | netfilter: nf_tables: remove nft_ctx_init_from_elemattr()net/ | +34 | 0 replies | |
| 3/13 | netfilter: nf_tables: remove nft_ctx_init_from_setattr()net/ | +25 | 0 replies | |
| 4/13 | netfilter: nftables: add nf_ct_pernet() helper functioninclude/ net/ net/ +4 more | +31 | 0 replies | |
| 5/13 | netfilter: conntrack: Introduce tcp offload timeout configurationinclude/ net/ net/ | +33 | 0 replies | |
| 6/13 | netfilter: conntrack: Introduce udp offload timeout configurationinclude/ net/ net/ | +31 | 0 replies | |
| 7/13 | netfilter: flowtable: Set offload timeouts according to proto valuesinclude/ net/ net/ | +41 | 0 replies | |
| 8/13 | netfilter: annotate nf_tables base hook opsinclude/ net/ | +10 | 0 replies | |
| 9/13 | netfilter: add new hook nfnl subsysteminclude/ include/ net/ +3 more | +443 | 0 replies | |
| 10/13 | netfilter: nft_exthdr: Fix for unsafe packet data readnet/ | +3 | 0 replies | |
| 11/13 | netfilter: nfnetlink_hook: fix array index out-of-bounds errornet/ | +1 | 0 replies | |
| 12/13 | netfilter: nfnetlink_hook: add depends-on nftablesnet/ | +1 | 0 replies | |
| 13/13 | netfilter: nf_tables: move base hook annotation to init helpernet/ | +7 | 0 replies |
Reviews trailers per patch
4 of 13 patches have a Reviewed-by or Acked-by.
| Patch | Paul Blakey | Florian Westphal |
|---|---|---|
| 1/13 | ||
| 2/13 | ||
| 3/13 | ||
| 4/13 | ||
| 5/13 | R-b | |
| 6/13 | R-b | |
| 7/13 | R-b | |
| 8/13 | ||
| 9/13 | ||
| 10/13 | R-b | |
| 11/13 | ||
| 12/13 | ||
| 13/13 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH net-next 00/13] Netfilter updates for net-next
Hi,
The following patchset contains Netfilter updates for net-next:
1) Add nfgenmsg field to nfnetlink's struct nfnl_info and use it.
2) Remove nft_ctx_init_from_elemattr() and nft_ctx_init_from_setattr() helper functions.
3) Add the nf_ct_pernet() helper function to fetch the conntrack pernetns data area.
4) Expose TCP and UDP flowtable offload timeouts through sysctl, from Oz Shlomo.
5) Add nfnetlink_hook subsystem to fetch the netfilter hook pipeline configuration, from Florian Westphal. This also includes a new field to annotate the hook type as metadata.
6) Fix unsafe memory access to non-linear skbuff in the new SCTP chunk support for nft_exthdr, from Phil Sutter.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thank you!
----------------------------------------------------------------
The following changes since commit 1a42624aecba438f1d114430a14b640cdfa51c87:
net: dsa: xrs700x: allow HSR/PRP supervision dupes for node_table (2021-06-04 14:49:28 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
for you to fetch changes up to c5c6accd7b7e10434d6afda4f6a5107c480bb4fb:
netfilter: nf_tables: move base hook annotation to init helper (2021-06-09 21:29:23 +0200)
----------------------------------------------------------------
Colin Ian King (1):
netfilter: nfnetlink_hook: fix array index out-of-bounds error
Florian Westphal (4):
netfilter: annotate nf_tables base hook ops
netfilter: add new hook nfnl subsystem
netfilter: nfnetlink_hook: add depends-on nftables
netfilter: nf_tables: move base hook annotation to init helper
Oz Shlomo (3):
netfilter: conntrack: Introduce tcp offload timeout configuration
netfilter: conntrack: Introduce udp offload timeout configuration
netfilter: flowtable: Set offload timeouts according to proto values
Pablo Neira Ayuso (4):
netfilter: nfnetlink: add struct nfgenmsg to struct nfnl_info and use it
netfilter: nf_tables: remove nft_ctx_init_from_elemattr()
netfilter: nf_tables: remove nft_ctx_init_from_setattr()
netfilter: nftables: add nf_ct_pernet() helper function
Phil Sutter (1):
netfilter: nft_exthdr: Fix for unsafe packet data read
include/linux/netfilter.h | 8 +- include/linux/netfilter/nfnetlink.h | 1 + include/net/netfilter/nf_conntrack.h | 7 + include/net/netfilter/nf_flow_table.h | 2 + include/net/netns/conntrack.h | 8 + include/uapi/linux/netfilter/nfnetlink.h | 3 +- include/uapi/linux/netfilter/nfnetlink_hook.h | 55 ++++ net/netfilter/Kconfig | 10 + net/netfilter/Makefile | 1 + net/netfilter/nf_conntrack_core.c | 22 +- net/netfilter/nf_conntrack_ecache.c | 8 +- net/netfilter/nf_conntrack_expect.c | 12 +- net/netfilter/nf_conntrack_helper.c | 6 +- net/netfilter/nf_conntrack_netlink.c | 23 +- net/netfilter/nf_conntrack_proto.c | 6 +- net/netfilter/nf_conntrack_proto_tcp.c | 5 + net/netfilter/nf_conntrack_proto_udp.c | 5 + net/netfilter/nf_conntrack_standalone.c | 54 +++- net/netfilter/nf_flow_table_core.c | 47 +++- net/netfilter/nf_flow_table_offload.c | 4 +- net/netfilter/nf_tables_api.c | 202 ++++++-------- net/netfilter/nfnetlink.c | 3 + net/netfilter/nfnetlink_hook.c | 375 ++++++++++++++++++++++++++ net/netfilter/nfnetlink_log.c | 5 +- net/netfilter/nfnetlink_queue.c | 9 +- net/netfilter/nft_compat.c | 17 +- net/netfilter/nft_exthdr.c | 4 +- 27 files changed, 697 insertions(+), 205 deletions(-) create mode 100644 include/uapi/linux/netfilter/nfnetlink_hook.h create mode 100644 net/netfilter/nfnetlink_hook.c