Skip to content

Netfilter/nftables/IPVS fixes for net

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18ipvs: fix AF assignment in ip_vs_conn_new()net/netfilter/ipvs/ip_vs_conn.c+4 -40 replies
2/18netfilter: nft_ct: fix unconditional dump of 'dir' attrnet/netfilter/nft_ct.c+13 -20 replies
3/18netfilter: nf_tables: fix oops when deleting a chain with referencesnet/netfilter/nf_tables_api.c+1 -10 replies
4/18netfilter: nf_conntrack: fix RCU race in nf_conntrack_find_getnet/netfilter/nf_conntrack_core.c+17 -40 replies
5/18netfilter: nf_nat_h323: fix crash in nf_ct_unlink_expect_report()net/ipv4/netfilter/nf_nat_h323.c+4 -10 replies
6/18netfilter: nf_conntrack: don't release a conntrack with non-zero refcntinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_synproxy_core.c +1 more+34 -140 replies
7/18netfilter: nf_tables: fix overrun in nf_tables_set_alloc_name()net/netfilter/nf_tables_api.c+2 -20 replies
8/18netfilter: nf_tables: fix potential oops when dumping setsnet/netfilter/nf_tables_api.c+5 -30 replies
9/18netfilter: nft_ct: fix missing NFT_CT_L3PROTOCOL key in validity checksnet/netfilter/nft_ct.c+1 -00 replies
10/18netfilter: nf_tables: add AF specific expression supportinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+21 -60 replies
11/18netfilter: nft_reject: split up reject module into IPv4 and IPv6 specifc partsinclude/net/netfilter/nft_reject.h net/ipv4/netfilter/Kconfig net/ipv4/netfilter/Makefile +6 more+187 -810 replies
12/18netfilter: nf_tables: add reject module for NFPROTO_INETinclude/net/netfilter/nft_reject.h net/ipv4/netfilter/nft_reject_ipv4.c net/ipv6/netfilter/nft_reject_ipv6.c +3 more+85 -60 replies
13/18netfilter: nf_tables: fix log/queue expressions for NFPROTO_INETnet/netfilter/nft_log.c net/netfilter/nft_queue.c+2 -70 replies
14/18netfilter: nf_tables: fix racy rule deletioninclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+23 -210 replies
15/18netfilter: nf_tables: do not allow NFT_SET_ELEM_INTERVAL_END flag and datanet/netfilter/nf_tables_api.c+3 -00 replies
16/18netfilter: nft_rbtree: fix data handling of end interval elementsnet/netfilter/nft_rbtree.c+11 -50 replies
17/18netfilter: nf_tables: fix loop checking with end interval elementsnet/netfilter/nf_tables_api.c+3 -00 replies
18/18netfilter: nf_tables: unininline nft_trace_packet()net/netfilter/nf_tables_core.c+3 -30 replies

Reviews trailers per patch

5 of 18 patches have a Reviewed-by or Acked-by.

PatchJulian AnastasovMatthew IfeEric DumazetAndrew VaginPatrick McHardy
1/18A-b
2/18
3/18T-b
4/18A-b
5/18
6/18R-b A-b
7/18
8/18
9/18
10/18
11/18
12/18
13/18
14/18
15/18A-b
16/18A-b
17/18
18/18

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

Read the v1 thread

Cover letter [PATCH 00/18] Netfilter/nftables/IPVS fixes for net

Hi David,

The following patchset contains Netfilter/IPVS fixes, mostly nftables fixes, most relevantly they are:

* Fix a crash in the h323 conntrack NAT helper due to expectation list corruption, from Alexey Dobriyan.

* A couple of RCU race fixes for conntrack, one manifests by hitting BUG_ON in nf_nat_setup_info() and the destroy path, patches from Andrey Vagin and me.

* Dump direction attribute in nft_ct only if it is set, from Arturo Borrero.

* Fix IPVS bug in its own connection tracking system that may lead to copying only 4 bytes of the IPv6 address when initializing the ip_vs_conn object, from Michal Kubecek.

* Fix -EBUSY errors in nftables when deleting the rules, chain and tables in a row due mixture of asynchronous and synchronous object releasing, from me.

* Three fixes for the nf_tables set infrastructure when using intervals and mappings, from me.

* Four patches to fixing the nf_tables log, reject and ct expressions from the new inet table, from Patrick McHardy.

* Fix memory overrun in the map that is used to dynamically allocate names from anonymous sets, also from Patrick.

* Fix a potential oops if you dump a set with NFPROTO_UNSPEC and a table name, from Patrick McHardy.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master

Thanks!

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

The following changes since commit d922e1cb1ea17ac7f0a5c3c2be98d4bd80d055b8:

net: Document promote_secondaries (2014-01-27 20:39:21 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master

for you to fetch changes up to 6d8c00d58e9e484fdc41aaaf62e5d8364efe375a:

netfilter: nf_tables: unininline nft_trace_packet() (2014-02-07 17:50:27 +0100)

----------------------------------------------------------------
Alexey Dobriyan (1):
netfilter: nf_nat_h323: fix crash in nf_ct_unlink_expect_report()

Andrey Vagin (1):
netfilter: nf_conntrack: fix RCU race in nf_conntrack_find_get

Arturo Borrero (1):
netfilter: nft_ct: fix unconditional dump of 'dir' attr

Michal Kubecek (1):
ipvs: fix AF assignment in ip_vs_conn_new()

Pablo Neira Ayuso (5):
netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt
netfilter: nf_tables: fix racy rule deletion
netfilter: nf_tables: do not allow NFT_SET_ELEM_INTERVAL_END flag and data
netfilter: nft_rbtree: fix data handling of end interval elements
netfilter: nf_tables: fix loop checking with end interval elements

Patrick McHardy (9):
netfilter: nf_tables: fix oops when deleting a chain with references
netfilter: nf_tables: fix overrun in nf_tables_set_alloc_name()
netfilter: nf_tables: fix potential oops when dumping sets
netfilter: nft_ct: fix missing NFT_CT_L3PROTOCOL key in validity checks
netfilter: nf_tables: add AF specific expression support
netfilter: nft_reject: split up reject module into IPv4 and IPv6 specifc parts
netfilter: nf_tables: add reject module for NFPROTO_INET
netfilter: nf_tables: fix log/queue expressions for NFPROTO_INET
netfilter: nf_tables: unininline nft_trace_packet()

 include/net/netfilter/nf_conntrack.h |    2 +
 include/net/netfilter/nf_tables.h    |    9 ++--
 include/net/netfilter/nft_reject.h   |   25 ++++++++++
 net/ipv4/netfilter/Kconfig           |    5 ++
 net/ipv4/netfilter/Makefile          |    1 +
 net/ipv4/netfilter/nf_nat_h323.c     |    5 +-
 net/ipv4/netfilter/nft_reject_ipv4.c |   75 ++++++++++++++++++++++++++++
 net/ipv6/netfilter/Kconfig           |    5 ++
 net/ipv6/netfilter/Makefile          |    1 +
 net/ipv6/netfilter/nft_reject_ipv6.c |   76 +++++++++++++++++++++++++++++
 net/netfilter/Kconfig                |    6 ++-
 net/netfilter/Makefile               |    1 +
 net/netfilter/ipvs/ip_vs_conn.c      |    8 +--
 net/netfilter/nf_conntrack_core.c    |   55 +++++++++++++++++----
 net/netfilter/nf_synproxy_core.c     |    5 +-
 net/netfilter/nf_tables_api.c        |   82 ++++++++++++++++++++-----------
 net/netfilter/nf_tables_core.c       |    6 +--
 net/netfilter/nft_ct.c               |   16 +++++-
 net/netfilter/nft_log.c              |    5 +-
 net/netfilter/nft_queue.c            |    4 +-
 net/netfilter/nft_rbtree.c           |   16 ++++--
 net/netfilter/nft_reject.c           |   89 ++++------------------------------
 net/netfilter/nft_reject_inet.c      |   63 ++++++++++++++++++++++++
 net/netfilter/xt_CT.c                |    7 +--
 24 files changed, 413 insertions(+), 154 deletions(-)
 create mode 100644 include/net/netfilter/nft_reject.h
 create mode 100644 net/ipv4/netfilter/nft_reject_ipv4.c
 create mode 100644 net/ipv6/netfilter/nft_reject_ipv6.c
 create mode 100644 net/netfilter/nft_reject_inet.c