Skip to content

Netfilter/IPVS fixes for net

Pablo Neira Ayuso netdev 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: ipt_CLUSTERIP: put config struct if we can't increment ct refcountnet/ipv4/netfilter/ipt_CLUSTERIP.c+6 -20 replies
2/14netfilter: ipt_CLUSTERIP: put config instead of freeing itnet/ipv4/netfilter/ipt_CLUSTERIP.c+4 -30 replies
3/14netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pktnet/ipv6/netfilter/nf_nat_l3proto_ipv6.c+4 -00 replies
4/14netfilter: bridge: ebt_among: add missing match size checksnet/bridge/netfilter/ebt_among.c+19 -20 replies
5/14netfilter: ebtables: convert BUG_ONs to WARN_ONsnet/bridge/netfilter/ebtables.c+18 -90 replies
6/14netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsetsnet/bridge/netfilter/ebtables.c+12 -10 replies
7/14netfilter: nf_flow_table: fix checksum when handling DNATnet/ipv4/netfilter/nf_flow_table_ipv4.c+1 -00 replies
8/14netfilter: increase IPSTATS_MIB_CSUMERRORS statnet/bridge/br_netfilter_hooks.c+3 -10 replies
9/14netfilter: don't set F_IFACE on ipv6 fib lookupsnet/ipv6/netfilter/ip6t_rpfilter.c net/ipv6/netfilter/nft_fib_ipv6.c+2 -140 replies
10/14netfilter: use skb_to_full_sk in ip6_route_me_hardernet/ipv6/netfilter.c+5 -40 replies
11/14netfilter: nf_tables: return EBUSY if device already belongs to flowtablenet/netfilter/nf_tables_api.c+17 -10 replies
12/14netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable()net/netfilter/nf_tables_api.c+5 -00 replies
13/14netfilter: nf_tables: use the right index from flowtable error pathnet/netfilter/nf_tables_api.c+1 -10 replies
14/14ipvs: remove IPS_NAT_MASK check to fix passive FTPnet/netfilter/ipvs/ip_vs_ftp.c+1 -10 replies

Reviews trailers per patch

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

Patch[email protected]Simon Horman
1/14
2/14
3/14Reported-and-tested-by
4/14
5/14
6/14
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14A-b

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/IPVS fixes for net

Hi David,

The following patchset contains Netfilter fixes for your net tree, they are:

1) Put back reference on CLUSTERIP configuration structure from the error path, patch from Florian Westphal.

2) Put reference on CLUSTERIP configuration instead of freeing it, another cpu may still be walking over it, also from Florian.

3) Refetch pointer to IPv6 header from nf_nat_ipv6_manip_pkt() given packet manipulation may reallocation the skbuff header, from Florian.

4) Missing match size sanity checks in ebt_among, from Florian.

5) Convert BUG_ON to WARN_ON in ebtables, from Florian.

6) Sanity check userspace offsets from ebtables kernel, from Florian.

7) Missing checksum replace call in flowtable IPv4 DNAT, from Felix Fietkau.

8) Bump the right stats on checksum error from bridge netfilter, from Taehee Yoo.

9) Unset interface flag in IPv6 fib lookups otherwise we get misleading routing lookup results, from Florian.

10) Missing sk_to_full_sk() in ip6_route_me_harder() from Eric Dumazet.

11) Don't allow devices to be part of multiple flowtables at the same time, this may break setups.

12) Missing netlink attribute validation in flowtable deletion.

13) Wrong array index in nf_unregister_net_hook() call from error path in flowtable addition path.

14) Fix FTP IPVS helper when NAT mangling is in place, patch from Julian Anastasov.

You can pull these changes from:

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

Thanks!

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

The following changes since commit 9cb9c07d6b0c5fd97d83b8ab14d7e308ba4b612f:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-02-23 15:14:17 -0800)

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 8a949fff0302b50063f74bb345a66190015528d0:

ipvs: remove IPS_NAT_MASK check to fix passive FTP (2018-02-28 19:48:26 +0100)

----------------------------------------------------------------
Eric Dumazet (1):
netfilter: use skb_to_full_sk in ip6_route_me_harder

Felix Fietkau (1):
netfilter: nf_flow_table: fix checksum when handling DNAT

Florian Westphal (7):
netfilter: ipt_CLUSTERIP: put config struct if we can't increment ct refcount
netfilter: ipt_CLUSTERIP: put config instead of freeing it
netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt
netfilter: bridge: ebt_among: add missing match size checks
netfilter: ebtables: convert BUG_ONs to WARN_ONs
netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
netfilter: don't set F_IFACE on ipv6 fib lookups

Julian Anastasov (1):
ipvs: remove IPS_NAT_MASK check to fix passive FTP

Pablo Neira Ayuso (3):
netfilter: nf_tables: return EBUSY if device already belongs to flowtable
netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable()
netfilter: nf_tables: use the right index from flowtable error path

Taehee Yoo (1):
netfilter: increase IPSTATS_MIB_CSUMERRORS stat

 net/bridge/br_netfilter_hooks.c          |  4 +++-
 net/bridge/netfilter/ebt_among.c         | 21 +++++++++++++++--
 net/bridge/netfilter/ebtables.c          | 40 ++++++++++++++++++++++++--------
 net/ipv4/netfilter/ipt_CLUSTERIP.c       | 15 ++++++++----
 net/ipv4/netfilter/nf_flow_table_ipv4.c  |  1 +
 net/ipv6/netfilter.c                     |  9 +++----
 net/ipv6/netfilter/ip6t_rpfilter.c       |  4 ----
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c |  4 ++++
 net/ipv6/netfilter/nft_fib_ipv6.c        | 12 ++--------
 net/netfilter/ipvs/ip_vs_ftp.c           |  2 +-
 net/netfilter/nf_tables_api.c            | 25 ++++++++++++++++++--
 11 files changed, 98 insertions(+), 39 deletions(-)