Skip to content

Netfilter updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest23 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23netfilter: ebtables: use __u64 from linux/types.hinclude/uapi/linux/netfilter_bridge/ebtables.h+4 -20 replies
2/23netfilter: fix include files for compilationinclude/uapi/linux/netfilter/ipset/ip_set_bitmap.h include/uapi/linux/netfilter/ipset/ip_set_hash.h include/uapi/linux/netfilter/ipset/ip_set_list.h +23 more+42 -80 replies
3/23netfilter-bridge: Cleanse indentationnet/bridge/netfilter/ebt_stp.c net/bridge/netfilter/ebtable_filter.c net/bridge/netfilter/ebtable_nat.c +1 more+25 -250 replies
4/23netfilter-bridge: use netdev style commentsnet/bridge/netfilter/ebt_log.c net/bridge/netfilter/ebt_vlan.c net/bridge/netfilter/ebtables.c+56 -460 replies
5/23netfilter-bridge: brace placementnet/bridge/netfilter/ebt_log.c net/bridge/netfilter/ebtables.c+3 -60 replies
6/23netfilter-bridge: layout of if statementsnet/bridge/netfilter/ebt_ip6.c net/bridge/netfilter/ebtables.c+6 -60 replies
7/23netfilter: nf_ct_sctp: move ip_ct_sctp away from UAPIinclude/linux/netfilter/nf_conntrack_sctp.h include/uapi/linux/netfilter/nf_conntrack_sctp.h+16 -90 replies
8/23netfilter: remove duplicate includenet/ipv4/netfilter/nf_reject_ipv4.c net/ipv6/netfilter/nf_reject_ipv6.c+0 -20 replies
9/23netfilter: ipv6: nf_defrag: avoid/free clone operationsinclude/net/netfilter/ipv6/nf_defrag_ipv6.h net/ipv6/netfilter/nf_conntrack_reasm.c net/ipv6/netfilter/nf_defrag_ipv6_hooks.c +1 more+40 -860 replies
10/23netfilter: ipv6: avoid nf_iterate recursioninclude/net/netfilter/ipv6/nf_defrag_ipv6.h net/ipv6/netfilter/nf_conntrack_reasm.c net/ipv6/netfilter/nf_defrag_ipv6_hooks.c +1 more+42 -560 replies
11/23netfilter: Set /proc/net entries owner to root in namespacenet/netfilter/nf_conntrack_expect.c net/netfilter/nf_conntrack_standalone.c net/netfilter/nfnetlink_log.c +1 more+39 -20 replies
12/23netfilter: nf_tables: remove unused struct membersinclude/net/netfilter/nf_tables.h+0 -20 replies
13/23netfilter: nft_payload: add packet mangling supportinclude/net/netfilter/nf_tables_core.h include/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_payload.c+155 -60 replies
14/23netfilter: nf_tables: extend tracing infrastructureinclude/net/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h include/uapi/linux/netfilter/nfnetlink.h +5 more+398 -190 replies
15/23netfilter: nf_tables: wrap tracing with a static keyinclude/net/netfilter/nf_tables_core.h include/net/netfilter/nft_meta.h net/bridge/netfilter/nft_meta_bridge.c +3 more+31 -30 replies
16/23netfilter: ipv6: nf_defrag: fix NULL deref panicnet/ipv6/netfilter/nf_conntrack_reasm.c+8 -50 replies
17/23netfilter: nfnetlink_log: Change setter functions to be voidnet/netfilter/nfnetlink_log.c+2 -60 replies
18/23netfilter: nf_tables: fix nf_log_trace based tracingnet/netfilter/nf_tables_core.c+5 -110 replies
19/23netfilter: cttimeout: add netns supportinclude/net/net_namespace.h include/net/netfilter/nf_conntrack_timeout.h net/netfilter/nf_conntrack_timeout.c +2 more+57 -340 replies
20/23netfilter: prepare xt_cgroup for multi revisionsinclude/uapi/linux/netfilter/xt_cgroup.h net/netfilter/xt_cgroup.c+20 -180 replies
21/23netfilter: implement xt_cgroup cgroup2 path matchinclude/uapi/linux/netfilter/xt_cgroup.h net/netfilter/xt_cgroup.c+82 -00 replies
22/23nfnetlink: add nfnl_dereference_protected helpernet/netfilter/nfnetlink.c+7 -60 replies
23/23netfilter: meta: add support for setting skb->pkttypenet/netfilter/nft_meta.c+38 -00 replies

Reviews trailers per patch

3 of 23 patches have a Reviewed-by or Acked-by.

PatchNeil HormanPatrick McHardyValdis Kletnieks
1/23
2/23
3/23
4/23
5/23
6/23
7/23A-b
8/23
9/23
10/23
11/23
12/23
13/23
14/23A-b
15/23A-b
16/23T-b
17/23
18/23
19/23
20/23
21/23
22/23
23/23

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/23] Netfilter updates for net-next

Hi David,

The following patchset contains the first batch of Netfilter updates for the upcoming 4.5 kernel. This batch contains userspace netfilter header compilation fixes, support for packet mangling in nf_tables, the new tracing infrastructure for nf_tables and cgroup2 support for iptables. More specifically, they are:

1) Two patches to include dependencies in our netfilter userspace headers to resolve compilation problems, from Mikko Rapeli.

2) Four comestic cleanup patches for the ebtables codebase, from Ian Morris.

3) Remove duplicate include in the netfilter reject infrastructure, from Stephen Hemminger.

4) Two patches to simplify the netfilter defragmentation code for IPv6, patch from Florian Westphal.

5) Fix root ownership of /proc/net netfilter for unpriviledged net namespaces, from Philip Whineray.

6) Get rid of unused fields in struct nft_pktinfo, from Florian Westphal.

7) Add mangling support to our nf_tables payload expression, from Patrick McHardy.

8) Introduce a new netlink-based tracing infrastructure for nf_tables, from Florian Westphal.

9) Change setter functions in nfnetlink_log to be void, from Rami Rosen.

10) Add netns support to the cttimeout infrastructure.

11) Add cgroup2 support to iptables, from Tejun Heo.

12) Introduce nfnl_dereference_protected() in nfnetlink, from Florian.

13) Add support for mangling pkttype in the nf_tables meta expression, also from Florian.

BTW, I need that you pull net into net-next, I have another batch that requires changes that I don't yet see in net.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

Thanks!

----------------------------------------------------------------

The following changes since commit cb4396edd84ed73081635fb933d19c1410fafaf4:

drivers/net: fix eisa_driver probe section mismatch (2015-12-14 00:24:22 -0500)

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 b4aae759c22e71a3c32144f0b3bc4f2fa4aaae98:

netfilter: meta: add support for setting skb->pkttype (2015-12-18 14:12:56 +0100)

----------------------------------------------------------------
Florian Westphal (9):
netfilter: ipv6: nf_defrag: avoid/free clone operations
netfilter: ipv6: avoid nf_iterate recursion
netfilter: nf_tables: remove unused struct members
netfilter: nf_tables: extend tracing infrastructure
netfilter: nf_tables: wrap tracing with a static key
netfilter: ipv6: nf_defrag: fix NULL deref panic
netfilter: nf_tables: fix nf_log_trace based tracing
nfnetlink: add nfnl_dereference_protected helper
netfilter: meta: add support for setting skb->pkttype

Ian Morris (4):
netfilter-bridge: Cleanse indentation
netfilter-bridge: use netdev style comments
netfilter-bridge: brace placement
netfilter-bridge: layout of if statements

Marcelo Ricardo Leitner (1):
netfilter: nf_ct_sctp: move ip_ct_sctp away from UAPI

Mikko Rapeli (2):
netfilter: ebtables: use __u64 from linux/types.h
netfilter: fix include files for compilation

Pablo Neira (1):
netfilter: cttimeout: add netns support

Pablo Neira Ayuso (1):
Merge branch 'master' of git://git.kernel.org/.../davem/net-next

Patrick McHardy (1):
netfilter: nft_payload: add packet mangling support

Philip Whineray (1):
netfilter: Set /proc/net entries owner to root in namespace

Rosen, Rami (1):
netfilter: nfnetlink_log: Change setter functions to be void

Tejun Heo (2):
netfilter: prepare xt_cgroup for multi revisions
netfilter: implement xt_cgroup cgroup2 path match

stephen hemminger (1):
netfilter: remove duplicate include

 include/linux/netfilter/nf_conntrack_sctp.h        |  13 +
 include/net/net_namespace.h                        |   3 +
 include/net/netfilter/ipv6/nf_defrag_ipv6.h        |   3 +-
 include/net/netfilter/nf_conntrack_timeout.h       |   2 +-
 include/net/netfilter/nf_tables.h                  |  34 ++-
 include/net/netfilter/nf_tables_core.h             |  10 +
 include/net/netfilter/nft_meta.h                   |   3 +
 include/uapi/linux/netfilter/ipset/ip_set_bitmap.h |   2 +
 include/uapi/linux/netfilter/ipset/ip_set_hash.h   |   2 +
 include/uapi/linux/netfilter/ipset/ip_set_list.h   |   2 +
 include/uapi/linux/netfilter/nf_conntrack_sctp.h   |  12 +-
 .../linux/netfilter/nf_conntrack_tuple_common.h    |   3 +
 include/uapi/linux/netfilter/nf_tables.h           |  69 ++++++
 include/uapi/linux/netfilter/nfnetlink.h           |   2 +
 include/uapi/linux/netfilter/xt_HMARK.h            |   1 +
 include/uapi/linux/netfilter/xt_RATEEST.h          |   1 +
 include/uapi/linux/netfilter/xt_TEE.h              |   2 +
 include/uapi/linux/netfilter/xt_TPROXY.h           |   1 +
 include/uapi/linux/netfilter/xt_cgroup.h           |  15 +-
 include/uapi/linux/netfilter/xt_hashlimit.h        |   1 +
 include/uapi/linux/netfilter/xt_ipvs.h             |   1 +
 include/uapi/linux/netfilter/xt_mac.h              |   2 +
 include/uapi/linux/netfilter/xt_osf.h              |   2 +
 include/uapi/linux/netfilter/xt_physdev.h          |   2 +-
 include/uapi/linux/netfilter/xt_policy.h           |   2 +
 include/uapi/linux/netfilter/xt_rateest.h          |   1 +
 include/uapi/linux/netfilter/xt_recent.h           |   1 +
 include/uapi/linux/netfilter/xt_sctp.h             |  12 +-
 include/uapi/linux/netfilter_arp/arp_tables.h      |   1 +
 include/uapi/linux/netfilter_bridge.h              |   1 +
 include/uapi/linux/netfilter_bridge/ebt_arp.h      |   1 +
 include/uapi/linux/netfilter_bridge/ebt_arpreply.h |   2 +
 include/uapi/linux/netfilter_bridge/ebt_ip6.h      |   1 +
 include/uapi/linux/netfilter_bridge/ebt_nat.h      |   2 +
 include/uapi/linux/netfilter_bridge/ebtables.h     |   6 +-
 include/uapi/linux/netfilter_ipv4/ip_tables.h      |   1 +
 include/uapi/linux/netfilter_ipv6/ip6_tables.h     |   1 +
 include/uapi/linux/netfilter_ipv6/ip6t_rt.h        |   2 +-
 net/bridge/netfilter/ebt_ip6.c                     |   4 +-
 net/bridge/netfilter/ebt_log.c                     |   9 +-
 net/bridge/netfilter/ebt_stp.c                     |   2 +-
 net/bridge/netfilter/ebt_vlan.c                    |  15 +-
 net/bridge/netfilter/ebtable_filter.c              |   2 +-
 net/bridge/netfilter/ebtable_nat.c                 |   2 +-
 net/bridge/netfilter/ebtables.c                    | 139 ++++++-----
 net/bridge/netfilter/nft_meta_bridge.c             |   1 +
 net/ipv4/netfilter/nf_reject_ipv4.c                |   1 -
 net/ipv6/netfilter/nf_conntrack_reasm.c            | 167 ++++++-------
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |  20 +-
 net/ipv6/netfilter/nf_reject_ipv6.c                |   1 -
 net/netfilter/Makefile                             |   2 +-
 net/netfilter/nf_conntrack_expect.c                |   7 +
 net/netfilter/nf_conntrack_standalone.c            |   7 +
 net/netfilter/nf_conntrack_timeout.c               |   2 +-
 net/netfilter/nf_tables_api.c                      |  12 +-
 net/netfilter/nf_tables_core.c                     |  62 +++--
 net/netfilter/nf_tables_trace.c                    | 275 +++++++++++++++++++++
 net/netfilter/nfnetlink.c                          |  14 +-
 net/netfilter/nfnetlink_cttimeout.c                |  82 +++---
 net/netfilter/nfnetlink_log.c                      |  23 +-
 net/netfilter/nft_meta.c                           |  54 ++++
 net/netfilter/nft_payload.c                        | 135 +++++++++-
 net/netfilter/x_tables.c                           |  12 +
 net/netfilter/xt_CT.c                              |   2 +-
 net/netfilter/xt_cgroup.c                          | 105 ++++++--
 net/openvswitch/conntrack.c                        |  25 +-
 66 files changed, 1062 insertions(+), 342 deletions(-)
 create mode 100644 include/linux/netfilter/nf_conntrack_sctp.h
 create mode 100644 net/netfilter/nf_tables_trace.c