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 Latest26 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/26netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gathernet/ipv6/netfilter.c+3 -10 replies
2/26netfilter: ipset: remove useless memset() callsnet/netfilter/ipset/ip_set_core.c+0 -20 replies
3/26netfilter: ipset: merge uadd and udel functionsnet/netfilter/ipset/ip_set_core.c+20 -510 replies
4/26netfilter: ipset: fix a missing check of nla_parsenet/netfilter/ipset/ip_set_core.c+7 -30 replies
5/26netfilter: ipset: Fix the last missing check of nla_parse_deprecated()net/netfilter/ipset/ip_set_core.c+6 -40 replies
6/26netfilter: ipset: Fix error path in set_target_v3_checkentry()net/netfilter/xt_set.c+21 -200 replies
7/26ipset: Fix memory accounting for hash types on resizenet/netfilter/ipset/ip_set_hash_gen.h+1 -10 replies
8/26Update my email addressCREDITS MAINTAINERS include/linux/jhash.h +31 more+49 -490 replies
9/26netfilter: nft_ct: add ct expectations supportinclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_ct.c+149 -30 replies
10/26netfilter: conntrack: small conntrack lookup optimizationinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_core.c+16 -160 replies
11/26netfilter: xt_owner: bail out with EINVAL in case of unsupported flagsinclude/uapi/linux/netfilter/xt_owner.h net/netfilter/xt_owner.c+8 -00 replies
12/26netfilter: bridge: port sysctls to use brnf_netinclude/net/netfilter/br_netfilter.h net/bridge/br_netfilter_hooks.c net/bridge/br_netfilter_ipv6.c+107 -600 replies
13/26netfilter: bridge: namespace bridge netfilter sysctlsnet/bridge/br_netfilter_hooks.c+72 -450 replies
14/26netfilter: synproxy: add common uapi for SYNPROXY infrastructureinclude/uapi/linux/netfilter/nf_SYNPROXY.h include/uapi/linux/netfilter/xt_SYNPROXY.h+26 -110 replies
15/26netfilter: synproxy: remove module dependency on IPv6 SYNPROXYinclude/linux/netfilter_ipv6.h net/ipv6/netfilter.c+38 -00 replies
16/26netfilter: synproxy: extract SYNPROXY infrastructure from {ipt, ip6t}_SYNPROXYinclude/net/netfilter/nf_conntrack_synproxy.h include/net/netfilter/nf_synproxy.h net/ipv4/netfilter/ipt_SYNPROXY.c +2 more+920 -8470 replies
17/26netfilter: synproxy: ensure zero is returned on non-error return pathnet/netfilter/nf_synproxy_core.c+2 -20 replies
18/26netfilter: nft_ct: fix null pointer in ct expectations supportnet/netfilter/nft_ct.c+4 -00 replies
19/26netfilter: nf_tables: enable set expiration time for set elementsinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nft_dynset.c+22 -80 replies
20/26netfilter: synproxy: fix building syncookie callsinclude/linux/netfilter_ipv6.h net/ipv6/netfilter.c+10 -60 replies
21/26netfilter: synproxy: use nf_cookie_v6_check() from corenet/netfilter/nf_synproxy_core.c+1 -10 replies
22/26netfilter: bridge: prevent UAF in brnf_exit_net()net/bridge/br_netfilter_hooks.c+3 -10 replies
23/26netfilter: fix nf_conntrack_bridge/ipv6 link errorinclude/linux/netfilter_ipv6.h+12 -40 replies
24/26netfilter: bridge: Fix non-untagged fragment packetnet/bridge/netfilter/nf_conntrack_bridge.c+2 -00 replies
25/26netfilter: synproxy: fix manual bump of the reference counternet/ipv4/netfilter/ipt_SYNPROXY.c+0 -10 replies
26/26netfilter: nf_tables: add support for matching IPv4 optionsinclude/uapi/linux/netfilter/nf_tables.h net/ipv4/ip_options.c net/netfilter/nft_exthdr.c+136 -00 replies

Reviews trailers per patch

1 of 26 patches has a Reviewed-by or Acked-by.

PatchFlorian Westphal
1/26
2/26
3/26
4/26
5/26
6/26
7/26
8/26
9/26
10/26
11/26
12/26
13/26
14/26
15/26
16/26
17/26
18/26
19/26
20/26
21/26
22/26
23/26
24/26A-b
25/26
26/26

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

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

Hi,

The following patches contains Netfilter updates for net-next:

1) .br_defrag indirection depends on CONFIG_NF_DEFRAG_IPV6, from wenxu.

2) Remove unnecessary memset() in ipset, from Florent Fourcot.

3) Merge control plane addition and deletion in ipset, also from Florent.

4) A few missing check for nla_parse() in ipset, from Aditya Pakki and Jozsef Kadlecsik.

5) Incorrect cleanup in error path of xt_set version 3, from Jozsef.

6) Memory accounting problems when resizing in ipset, from Stefano Brivio.

7) Jozsef updates his email to @netfilter.org, this batch comes with a conflict resolution with recent SPDX header updates.

8) Add to create custom conntrack expectations via nftables, from Stephane Veyret.

9) A lookup optimization for conntrack, from Florian Westphal.

10) Check for supported flags in xt_owner.

11) Support for pernet sysctl in br_netfilter, patches from Christian Brauner.

12) Patches to move common synproxy infrastructure to nf_synproxy.c, to prepare the synproxy support for nf_tables, patches from Fernando Fernandez Mancera.

13) Support to restore expiration time in set element, from Laura Garcia.

14) Fix recent rewrite of netfilter IPv6 to avoid indirections when CONFIG_IPV6 is unset, from Arnd Bergmann.

15) Always reset vlan tag on skbuff fraglist when refragmenting in bridge conntrack, from wenxu.

16) Support to match IPv4 options in nf_tables, from Stephen Suryaputra.

You can pull these changes from:

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

This batch comes with a conflict resolution between a patch to remove the GPL disclaimer by SPDX tags and Jozsef Kladecsik's email update.

Thanks.

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

The following changes since commit 045df37e743c7448931131988e99e8fe0cc92a54:

Merge branch 'cxgb4-Reference-count-MPS-TCAM-entries-within-a-PF' (2019-06-24 14:54:06 -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 1c5ba67d2277ac2faf37c61076e8b5fa312be492:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (2019-06-25 01:32:59 +0200)

----------------------------------------------------------------
Aditya Pakki (1):
netfilter: ipset: fix a missing check of nla_parse

Arnd Bergmann (2):
netfilter: synproxy: fix building syncookie calls
netfilter: fix nf_conntrack_bridge/ipv6 link error

Christian Brauner (3):
netfilter: bridge: port sysctls to use brnf_net
netfilter: bridge: namespace bridge netfilter sysctls
netfilter: bridge: prevent UAF in brnf_exit_net()

Colin Ian King (1):
netfilter: synproxy: ensure zero is returned on non-error return path

Fernando Fernandez Mancera (4):
netfilter: synproxy: add common uapi for SYNPROXY infrastructure
netfilter: synproxy: remove module dependency on IPv6 SYNPROXY
netfilter: synproxy: extract SYNPROXY infrastructure from {ipt, ip6t}_SYNPROXY
netfilter: synproxy: fix manual bump of the reference counter

Florent Fourcot (2):
netfilter: ipset: remove useless memset() calls
netfilter: ipset: merge uadd and udel functions

Florian Westphal (1):
netfilter: conntrack: small conntrack lookup optimization

Jozsef Kadlecsik (3):
netfilter: ipset: Fix the last missing check of nla_parse_deprecated()
netfilter: ipset: Fix error path in set_target_v3_checkentry() Update my email address

Laura Garcia Liebana (1):
netfilter: nf_tables: enable set expiration time for set elements

Pablo Neira Ayuso (4):
netfilter: xt_owner: bail out with EINVAL in case of unsupported flags Merge branch 'master' of git://blackhole.kfki.hu/nf-next
netfilter: synproxy: use nf_cookie_v6_check() from core Merge git://git.kernel.org/.../davem/net-next

Stefano Brivio (1):
ipset: Fix memory accounting for hash types on resize

Stephen Suryaputra (1):
netfilter: nf_tables: add support for matching IPv4 options

Stéphane Veyret (2):
netfilter: nft_ct: add ct expectations support
netfilter: nft_ct: fix null pointer in ct expectations support

wenxu (2):
netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather
netfilter: bridge: Fix non-untagged fragment packet

 CREDITS                                        |   2 +-
 MAINTAINERS                                    |   2 +-
 include/linux/jhash.h                          |   2 +-
 include/linux/netfilter/ipset/ip_set.h         |   2 +-
 include/linux/netfilter/ipset/ip_set_counter.h |   3 +-
 include/linux/netfilter/ipset/ip_set_skbinfo.h |   3 +-
 include/linux/netfilter/ipset/ip_set_timeout.h |   3 +-
 include/linux/netfilter_ipv6.h                 |  54 +-
 include/net/netfilter/br_netfilter.h           |   3 +-
 include/net/netfilter/nf_conntrack.h           |   7 +-
 include/net/netfilter/nf_conntrack_synproxy.h  |  13 +-
 include/net/netfilter/nf_synproxy.h            |  44 ++
 include/net/netfilter/nf_tables.h              |   2 +-
 include/uapi/linux/netfilter/ipset/ip_set.h    |   2 +-
 include/uapi/linux/netfilter/nf_SYNPROXY.h     |  19 +
 include/uapi/linux/netfilter/nf_tables.h       |  16 +-
 include/uapi/linux/netfilter/xt_SYNPROXY.h     |  18 +-
 include/uapi/linux/netfilter/xt_owner.h        |   5 +
 net/bridge/br_netfilter_hooks.c                | 247 ++++---
 net/bridge/br_netfilter_ipv6.c                 |   2 +-
 net/bridge/netfilter/nf_conntrack_bridge.c     |   2 +
 net/ipv4/ip_options.c                          |   1 +
 net/ipv4/netfilter/ipt_SYNPROXY.c              | 395 +----------
 net/ipv4/netfilter/iptable_raw.c               |   2 +-
 net/ipv4/netfilter/nf_nat_h323.c               |   2 +-
 net/ipv6/netfilter.c                           |   8 +-
 net/ipv6/netfilter/ip6t_SYNPROXY.c             | 420 +-----------
 net/ipv6/netfilter/ip6table_raw.c              |   2 +-
 net/netfilter/ipset/ip_set_bitmap_gen.h        |   3 +-
 net/netfilter/ipset/ip_set_bitmap_ip.c         |   4 +-
 net/netfilter/ipset/ip_set_bitmap_ipmac.c      |   3 +-
 net/netfilter/ipset/ip_set_bitmap_port.c       |   5 +-
 net/netfilter/ipset/ip_set_core.c              |  97 +--
 net/netfilter/ipset/ip_set_getport.c           |   6 +-
 net/netfilter/ipset/ip_set_hash_gen.h          |   5 +-
 net/netfilter/ipset/ip_set_hash_ip.c           |   5 +-
 net/netfilter/ipset/ip_set_hash_ipmark.c       |   4 +-
 net/netfilter/ipset/ip_set_hash_ipport.c       |   5 +-
 net/netfilter/ipset/ip_set_hash_ipportip.c     |   5 +-
 net/netfilter/ipset/ip_set_hash_ipportnet.c    |   5 +-
 net/netfilter/ipset/ip_set_hash_mac.c          |   5 +-
 net/netfilter/ipset/ip_set_hash_net.c          |   5 +-
 net/netfilter/ipset/ip_set_hash_netiface.c     |   5 +-
 net/netfilter/ipset/ip_set_hash_netnet.c       |   2 +-
 net/netfilter/ipset/ip_set_hash_netport.c      |   5 +-
 net/netfilter/ipset/ip_set_hash_netportnet.c   |   3 +-
 net/netfilter/ipset/ip_set_list_set.c          |   5 +-
 net/netfilter/nf_conntrack_core.c              |  25 +-
 net/netfilter/nf_conntrack_h323_main.c         |   2 +-
 net/netfilter/nf_conntrack_proto_tcp.c         |   2 +-
 net/netfilter/nf_synproxy_core.c               | 896 ++++++++++++++++++++++++-
 net/netfilter/nf_tables_api.c                  |  26 +-
 net/netfilter/nft_ct.c                         | 142 +++-
 net/netfilter/nft_dynset.c                     |   2 +-
 net/netfilter/nft_exthdr.c                     | 133 ++++
 net/netfilter/xt_iprange.c                     |   4 +-
 net/netfilter/xt_owner.c                       |   3 +
 net/netfilter/xt_set.c                         |  45 +-
 58 files changed, 1611 insertions(+), 1127 deletions(-)
 create mode 100644 include/net/netfilter/nf_synproxy.h
 create mode 100644 include/uapi/linux/netfilter/nf_SYNPROXY.h