Skip to content

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

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14netfilter: nfnetlink: avoid deadlock due to synchronous request_modulenet/netfilter/nfnetlink.c+1 -10 replies
2/14netfilter: Fix rpfilter dropping vrf packets by mistakenet/ipv4/netfilter/ipt_rpfilter.c net/ipv6/netfilter/ip6t_rpfilter.c+7 -20 replies
3/14netfilter: nf_conntrack_sip: fix expectation clashinclude/net/netfilter/nf_conntrack_expect.h net/ipv4/netfilter/nf_nat_h323.c net/netfilter/ipvs/ip_vs_nfct.c +17 more+71 -470 replies
4/14netfilter: Update obsolete comments referring to ip_conntrackinclude/linux/netfilter/nf_conntrack_h323_asn1.h net/ipv4/netfilter/ipt_CLUSTERIP.c net/netfilter/Kconfig +5 more+10 -180 replies
5/14netfilter: nf_tables: fix module autoload for redirnet/netfilter/nft_redir.c+1 -10 replies
6/14netfilter: synproxy: fix erroneous tcp mss optioninclude/net/netfilter/nf_conntrack_synproxy.h net/ipv4/netfilter/ipt_SYNPROXY.c net/ipv6/netfilter/ip6t_SYNPROXY.c +2 more+9 -20 replies
7/14netfilter: conntrack: always store window size un-scalednet/netfilter/nf_conntrack_proto_tcp.c+5 -30 replies
8/14netfilter: nf_tables: don't fail when updating base chain policynet/netfilter/nf_tables_api.c+2 -00 replies
9/14netfilter: nft_hash: fix symhash with modulus onenet/netfilter/nft_hash.c+1 -10 replies
10/14netfilter: nf_tables: Support auto-loading for inet natnet/netfilter/nft_chain_nat.c+3 -00 replies
11/14netfilter: synproxy: fix rst sequence number mismatchnet/netfilter/nf_synproxy_core.c+2 -20 replies
12/14netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a modulenet/netfilter/nft_meta.c+1 -10 replies
13/14netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGEnet/bridge/netfilter/Kconfig+2 -20 replies
14/14netfilter: bridge: make NF_TABLES_BRIDGE tristatenet/bridge/netfilter/Kconfig net/netfilter/nft_chain_filter.c net/netfilter/nft_meta.c+3 -30 replies

Reviews trailers per patch

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

PatchJakub JankowskiJozsef Kadlecsik
1/14
2/14
3/14
4/14
5/14
6/14
7/14T-b A-b
8/14
9/14
10/14
11/14
12/14
13/14
14/14

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/14] Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Fix a deadlock when module is requested via netlink_bind() in nfnetlink, from Florian Westphal.

2) Fix ipt_rpfilter and ip6t_rpfilter with VRF, from Miaohe Lin.

3) Skip master comparison in SIP helper to fix expectation clash under two valid scenarios, from xiao ruizhu.

4) Remove obsolete comments in nf_conntrack codebase, from Yonatan Goldschmidt.

5) Fix redirect extension module autoload, from Christian Hesse.

6) Fix incorrect mssg option sent to client in synproxy, from Fernando Fernandez.

7) Fix incorrect window calculations in TCP conntrack, from Florian Westphal.

8) Don't bail out when updating basechain policy due to recent offload works, also from Florian.

9) Allow symhash to use modulus 1 as other hash extensions do, from Laura.Garcia.

10) Missing NAT chain module autoload for the inet family, from Phil Sutter.

11) Fix missing adjustment of TCP RST packet in synproxy, from Fernando Fernandez.

12) Skip EAGAIN path when nft_meta_bridge is built-in or not selected.

13) Conntrack bridge does not depend on nf_tables_bridge.

14) Turn NF_TABLES_BRIDGE into tristate to fix possible link break of nft_meta_bridge, from Arnd Bergmann.

You can pull these changes from:

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

Thanks.

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

The following changes since commit 76104862cccaeaa84fdd23e39f2610a96296291c:

sky2: Disable MSI on P5W DH Deluxe (2019-07-14 13:45:54 -0700)

are available in the git repository at:

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

for you to fetch changes up to dfee0e99bcff718fa14d973c41f161220fdcb7d5:

netfilter: bridge: make NF_TABLES_BRIDGE tristate (2019-07-19 18:08:14 +0200)

----------------------------------------------------------------
Arnd Bergmann (1):
netfilter: bridge: make NF_TABLES_BRIDGE tristate

Christian Hesse (1):
netfilter: nf_tables: fix module autoload for redir

Fernando Fernandez Mancera (2):
netfilter: synproxy: fix erroneous tcp mss option
netfilter: synproxy: fix rst sequence number mismatch

Florian Westphal (3):
netfilter: nfnetlink: avoid deadlock due to synchronous request_module
netfilter: conntrack: always store window size un-scaled
netfilter: nf_tables: don't fail when updating base chain policy

Laura Garcia Liebana (1):
netfilter: nft_hash: fix symhash with modulus one

Miaohe Lin (1):
netfilter: Fix rpfilter dropping vrf packets by mistake

Pablo Neira Ayuso (2):
netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module
netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGE

Phil Sutter (1):
netfilter: nf_tables: Support auto-loading for inet nat

Yonatan Goldschmidt (1):
netfilter: Update obsolete comments referring to ip_conntrack

xiao ruizhu (1):
netfilter: nf_conntrack_sip: fix expectation clash

 include/linux/netfilter/nf_conntrack_h323_asn1.h |  3 +--
 include/net/netfilter/nf_conntrack_expect.h      | 12 ++++++++---
 include/net/netfilter/nf_conntrack_synproxy.h    |  1 +
 net/bridge/netfilter/Kconfig                     |  6 +++---
 net/ipv4/netfilter/ipt_CLUSTERIP.c               |  4 ++--
 net/ipv4/netfilter/ipt_SYNPROXY.c                |  2 ++
 net/ipv4/netfilter/ipt_rpfilter.c                |  1 +
 net/ipv4/netfilter/nf_nat_h323.c                 | 12 +++++------
 net/ipv6/netfilter/ip6t_SYNPROXY.c               |  2 ++
 net/ipv6/netfilter/ip6t_rpfilter.c               |  8 ++++++--
 net/netfilter/Kconfig                            |  6 ++----
 net/netfilter/ipvs/ip_vs_nfct.c                  |  2 +-
 net/netfilter/nf_conntrack_amanda.c              |  2 +-
 net/netfilter/nf_conntrack_broadcast.c           |  2 +-
 net/netfilter/nf_conntrack_core.c                |  4 +---
 net/netfilter/nf_conntrack_expect.c              | 26 +++++++++++++++++-------
 net/netfilter/nf_conntrack_ftp.c                 |  2 +-
 net/netfilter/nf_conntrack_h323_asn1.c           |  5 ++---
 net/netfilter/nf_conntrack_h323_main.c           | 18 ++++++++--------
 net/netfilter/nf_conntrack_irc.c                 |  2 +-
 net/netfilter/nf_conntrack_netlink.c             |  4 ++--
 net/netfilter/nf_conntrack_pptp.c                |  4 ++--
 net/netfilter/nf_conntrack_proto_gre.c           |  2 --
 net/netfilter/nf_conntrack_proto_icmp.c          |  2 +-
 net/netfilter/nf_conntrack_proto_tcp.c           |  8 +++++---
 net/netfilter/nf_conntrack_sane.c                |  2 +-
 net/netfilter/nf_conntrack_sip.c                 | 10 ++++++---
 net/netfilter/nf_conntrack_tftp.c                |  2 +-
 net/netfilter/nf_nat_amanda.c                    |  2 +-
 net/netfilter/nf_nat_core.c                      |  2 +-
 net/netfilter/nf_nat_ftp.c                       |  2 +-
 net/netfilter/nf_nat_irc.c                       |  2 +-
 net/netfilter/nf_nat_sip.c                       |  8 +++++---
 net/netfilter/nf_nat_tftp.c                      |  2 +-
 net/netfilter/nf_synproxy_core.c                 |  8 ++++----
 net/netfilter/nf_tables_api.c                    |  2 ++
 net/netfilter/nfnetlink.c                        |  2 +-
 net/netfilter/nft_chain_filter.c                 |  2 +-
 net/netfilter/nft_chain_nat.c                    |  3 +++
 net/netfilter/nft_ct.c                           |  2 +-
 net/netfilter/nft_hash.c                         |  2 +-
 net/netfilter/nft_meta.c                         |  2 +-
 net/netfilter/nft_redir.c                        |  2 +-
 net/netfilter/nft_synproxy.c                     |  2 ++
 44 files changed, 117 insertions(+), 82 deletions(-)