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

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9netfilter: arp_tables: init netns pointer in xt_tgchk_param structnet/ipv4/netfilter/arp_tables.c+16 -110 replies
2/9netfilter: nft_flow_offload: fix underflow in flowtable reference counternet/netfilter/nft_flow_offload.c+0 -30 replies
3/9netfilter: nf_flow_table_offload: fix incorrect ethernet dst addressnet/netfilter/nf_flow_table_offload.c+4 -20 replies
4/9netfilter: nf_flow_table_offload: check the status of dst_neighnet/netfilter/nf_flow_table_offload.c+14 -20 replies
5/9netfilter: nf_flow_table_offload: fix the nat port mangle.net/netfilter/nf_flow_table_offload.c+16 -80 replies
6/9netfilter: nf_tables: unbind callbacks from flowtable destroy pathnet/netfilter/nf_tables_api.c+6 -20 replies
7/9netfilter: flowtable: add nf_flowtable_time_stampinclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c net/netfilter/nf_flow_table_ip.c +1 more+11 -100 replies
8/9netfilter: conntrack: dccp, sctp: handle null timeout argumentnet/netfilter/nf_conntrack_proto_dccp.c net/netfilter/nf_conntrack_proto_sctp.c+6 -00 replies
9/9netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is presentnet/netfilter/ipset/ip_set_core.c+2 -10 replies

Reviews trailers per patch

4 of 9 patches have a Reviewed-by or Acked-by.

PatchCong WangwenxuJozsef Kadlecsik
1/9A-b
2/9
3/9
4/9
5/9
6/9A-b
7/9A-b
8/9
9/9A-b

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

Hi,

The following patchset contains Netfilter fixes for net:

1) Missing netns context in arp_tables, from Florian Westphal.

2) Underflow in flowtable reference counter, from wenxu.

3) Fix incorrect ethernet destination address in flowtable offload, from wenxu.

4) Check for status of neighbour entry, from wenxu.

5) Fix NAT port mangling, from wenxu.

6) Unbind callbacks from destroy path to cleanup hardware properly on flowtable removal.

7) Fix missing casting statistics timestamp, add nf_flowtable_time_stamp and use it.

8) NULL pointer exception when timeout argument is null in conntrack dccp and sctp protocol helpers, from Florian Westphal.

9) Possible nul-dereference in ipset with IPSET_ATTR_LINENO, also from Florian.

You can pull these changes from:

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

Thanks.

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

The following changes since commit bd6f48546b9cb7a785344fc78058c420923d7ed8:

net: stmmac: dwmac-meson8b: Fix the RGMII TX delay on Meson8b/8m2 SoCs (2019-12-27 16:37:07 -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 22dad713b8a5ff488e07b821195270672f486eb2:

netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present (2020-01-08 23:31:46 +0100)

----------------------------------------------------------------
Florian Westphal (3):
netfilter: arp_tables: init netns pointer in xt_tgchk_param struct
netfilter: conntrack: dccp, sctp: handle null timeout argument
netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present

Pablo Neira Ayuso (2):
netfilter: nf_tables: unbind callbacks from flowtable destroy path
netfilter: flowtable: add nf_flowtable_time_stamp

wenxu (4):
netfilter: nft_flow_offload: fix underflow in flowtable reference counter
netfilter: nf_flow_table_offload: fix incorrect ethernet dst address
netfilter: nf_flow_table_offload: check the status of dst_neigh
netfilter: nf_flow_table_offload: fix the nat port mangle.

 include/net/netfilter/nf_flow_table.h   |  6 ++++
 net/ipv4/netfilter/arp_tables.c         | 27 ++++++++++--------
 net/netfilter/ipset/ip_set_core.c       |  3 +-
 net/netfilter/nf_conntrack_proto_dccp.c |  3 ++
 net/netfilter/nf_conntrack_proto_sctp.c |  3 ++
 net/netfilter/nf_flow_table_core.c      |  7 +----
 net/netfilter/nf_flow_table_ip.c        |  4 +--
 net/netfilter/nf_flow_table_offload.c   | 50 ++++++++++++++++++++++++---------
 net/netfilter/nf_tables_api.c           |  8 ++++--
 net/netfilter/nft_flow_offload.c        |  3 --
 10 files changed, 75 insertions(+), 39 deletions(-)